diff --git a/Cargo.toml b/Cargo.toml
index 4763f300..31d399b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -681,15 +681,9 @@ lto = "fat"
 #	'-Ctarget-feature=+crt-static',
 #	'-Crelocation-model=static',
 #	'-Ztls-model=local-exec',
-#	'-Zinline-in-all-cgus=true',
 #	'-Zinline-mir=true',
 #	'-Zmir-opt-level=3',
-#	'-Clink-arg=-fuse-ld=gold',
-#	'-Clink-arg=-Wl,--threads',
 #	'-Clink-arg=-Wl,--gc-sections',
-#	'-Clink-arg=-luring',
-#	'-Clink-arg=-lstdc++',
-#	'-Clink-arg=-lc',
 #	'-Ztime-passes',
 #	'-Ztime-llvm-passes',
 #]
diff --git a/docker/bake.hcl b/docker/bake.hcl
index a10d3f2b..5a5829a3 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -128,6 +128,30 @@ nightly_rustflags = [
     "-Zenforce-type-length-limit",
 ]
 
+rmp_rustflags = [
+    "-Ctarget-cpu=native",
+    "-Ztune-cpu=native",
+    "-Ctarget-feature=+crt-static",
+    "-Crelocation-model=static",
+    "-Ztls-model=local-exec",
+    "-Zinline-mir=true",
+    "-Zmir-opt-level=3",
+    "-Clink-arg=-Wl,--gc-sections",
+    #"-Ztime-passes",
+    #"-Ztime-llvm-passes",
+]
+
+rmp_bo_rustflags = [
+    "-Crelocation-model=pic",
+    "-Ctarget-feature=-crt-static",
+    "-Clink-arg=-Wl,--no-gc-sections",
+]
+
+rmp_macro_rustflags = [
+    "-Crelocation-model=pic",
+    "-Ctarget-feature=-crt-static",
+]
+
 #
 # Default
 #