diff --git a/docker/bake.hcl b/docker/bake.hcl
index 1838351f..f879b49c 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -38,21 +38,24 @@ cargo_feat_sets = {
     default = "brotli_compression,element_hacks,gzip_compression,io_uring,jemalloc,jemalloc_conf,media_thumbnail,release_max_log_level,systemd,url_preview,zstd_compression"
     all = "blurhashing,brotli_compression,tuwunel_mods,console,default,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,media_thumbnail,perf_measurements,release_max_log_level,sentry_telemetry,systemd,tokio_console,url_preview,zstd_compression"
 }
-
 variable "cargo_features_always" {
     default = "direct_tls"
 }
-
 variable "feat_sets" {
     default = "[\"none\", \"default\", \"all\"]"
 }
+
 variable "cargo_profiles" {
     default = "[\"test\", \"release\"]"
 }
+
 variable "install_prefix" {
     default = "/usr"
 }
 
+variable "rust_msrv" {
+    default = "stable"
+}
 variable "rust_toolchains" {
     default = "[\"nightly\", \"stable\"]"
 }
@@ -1455,7 +1458,10 @@ target "rust" {
         input = elem("target:rustup", [rust_target, sys_name, sys_version, sys_target])
     }
     args = {
-        rust_toolchain = rust_toolchain
+        rust_toolchain = (rust_toolchain == "stable"?
+            rust_msrv: rust_toolchain
+        )
+
         rustup_components = join(" ", rustup_components)
         cargo_installs = join(" ", cargo_installs)
 
diff --git a/docker/bake.sh b/docker/bake.sh
index 9afd698f..c0a4f287 100755
--- a/docker/bake.sh
+++ b/docker/bake.sh
@@ -59,6 +59,8 @@ docker_dir="$PWD/$BASEDIR"
 runner_name=$(echo $RUNNER_NAME | cut -d"." -f1)
 runner_num=$(echo $RUNNER_NAME | cut -d"." -f2)
 builder_name="${GITHUB_ACTOR:-owo}"
+toolchain_toml="$docker_dir/../rust-toolchain.toml"
+rust_msrv=$(grep "channel = " $toolchain_toml | cut -d'=' -f2 | sed 's/\s"\|"$//g')
 rocksdb_opt_level=3
 rocksdb_portable=1
 git_checkout="HEAD"