diff --git a/Cargo.toml b/Cargo.toml
index 13b9c2948ab6f..257aee4187415 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,9 @@ path = "src/api/schema/gen.rs"
 required-features = ["default-no-api-client"]
 
 [profile.release]
-lto = true
-codegen-units = 1
+lto = true        # Optimize our binary at link stage.
+codegen-units = 1 # Increases compile time but improves optmization alternatives.
+debug = false     # Do not include debug symbols in the executable.
 
 [profile.bench]
 debug = true
diff --git a/scripts/cross/aarch64-unknown-linux-gnu.dockerfile b/scripts/cross/aarch64-unknown-linux-gnu.dockerfile
index ea980706ca750..d30654ce1ed3b 100644
--- a/scripts/cross/aarch64-unknown-linux-gnu.dockerfile
+++ b/scripts/cross/aarch64-unknown-linux-gnu.dockerfile
@@ -1 +1 @@
-FROM rustembedded/cross:aarch64-unknown-linux-gnu
+FROM docker.io/rustembedded/cross:aarch64-unknown-linux-gnu
diff --git a/scripts/cross/aarch64-unknown-linux-musl.dockerfile b/scripts/cross/aarch64-unknown-linux-musl.dockerfile
index 3401d3883da9c..7bbe059f4a0f3 100644
--- a/scripts/cross/aarch64-unknown-linux-musl.dockerfile
+++ b/scripts/cross/aarch64-unknown-linux-musl.dockerfile
@@ -1 +1 @@
-FROM rustembedded/cross:aarch64-unknown-linux-musl
+FROM docker.io/rustembedded/cross:aarch64-unknown-linux-musl
diff --git a/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile b/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile
index 3a78d417b71e9..1ac15caf8fd11 100644
--- a/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile
+++ b/scripts/cross/armv7-unknown-linux-musleabihf.dockerfile
@@ -1 +1 @@
-FROM rustembedded/cross:armv7-unknown-linux-musleabihf
+FROM docker.io/rustembedded/cross:armv7-unknown-linux-musleabihf
diff --git a/scripts/cross/x86_64-unknown-linux-gnu.dockerfile b/scripts/cross/x86_64-unknown-linux-gnu.dockerfile
index f273869499f83..a451a5ac797d2 100644
--- a/scripts/cross/x86_64-unknown-linux-gnu.dockerfile
+++ b/scripts/cross/x86_64-unknown-linux-gnu.dockerfile
@@ -1 +1 @@
-FROM rustembedded/cross:x86_64-unknown-linux-gnu
+FROM docker.io/rustembedded/cross:x86_64-unknown-linux-gnu
diff --git a/scripts/cross/x86_64-unknown-linux-musl.dockerfile b/scripts/cross/x86_64-unknown-linux-musl.dockerfile
index 84f48313fcf41..e4ba5a04537ee 100644
--- a/scripts/cross/x86_64-unknown-linux-musl.dockerfile
+++ b/scripts/cross/x86_64-unknown-linux-musl.dockerfile
@@ -1 +1 @@
-FROM rustembedded/cross:x86_64-unknown-linux-musl
+FROM docker.io/rustembedded/cross:x86_64-unknown-linux-musl