diff --git a/docker/cross-darwin-arm64/Dockerfile.21 b/docker/cross-darwin-arm64/Dockerfile.21
new file mode 100644
index 0000000..410dd17
--- /dev/null
+++ b/docker/cross-darwin-arm64/Dockerfile.21
@@ -0,0 +1,5 @@
+FROM yosyshq/cross-darwin-arm64:2.0
+
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add aarch64-apple-darwin
\ No newline at end of file
diff --git a/docker/cross-darwin-arm64/build.sh b/docker/cross-darwin-arm64/build.sh
index 710ea97..50ab997 100755
--- a/docker/cross-darwin-arm64/build.sh
+++ b/docker/cross-darwin-arm64/build.sh
@@ -1 +1 @@
-docker build -t="yosyshq/cross-darwin-arm64:2.0" -f Dockerfile .
+docker build -t="yosyshq/cross-darwin-arm64:2.1" -f Dockerfile.21 .
diff --git a/docker/cross-darwin-x64/Dockerfile.21 b/docker/cross-darwin-x64/Dockerfile.21
new file mode 100644
index 0000000..3f66e2d
--- /dev/null
+++ b/docker/cross-darwin-x64/Dockerfile.21
@@ -0,0 +1,5 @@
+FROM yosyshq/cross-darwin-x64:2.0
+
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add x86_64-apple-darwin
\ No newline at end of file
diff --git a/docker/cross-darwin-x64/build.sh b/docker/cross-darwin-x64/build.sh
index fc28ece..bd5c8b7 100755
--- a/docker/cross-darwin-x64/build.sh
+++ b/docker/cross-darwin-x64/build.sh
@@ -1 +1 @@
-docker build -t="yosyshq/cross-darwin-x64:2.0" -f Dockerfile .
+docker build -t="yosyshq/cross-darwin-x64:2.1" -f Dockerfile.21 .
diff --git a/docker/cross-linux-arm64/Dockerfile.21 b/docker/cross-linux-arm64/Dockerfile.21
new file mode 100644
index 0000000..a3ac1fb
--- /dev/null
+++ b/docker/cross-linux-arm64/Dockerfile.21
@@ -0,0 +1,5 @@
+FROM yosyshq/cross-linux-arm64:2.0
+
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-gnu
diff --git a/docker/cross-linux-arm64/build.sh b/docker/cross-linux-arm64/build.sh
index f3198f4..708cb72 100755
--- a/docker/cross-linux-arm64/build.sh
+++ b/docker/cross-linux-arm64/build.sh
@@ -1 +1 @@
-docker build -t="yosyshq/cross-linux-arm64:2.0" -f Dockerfile .
+docker build -t="yosyshq/cross-linux-arm64:2.1" -f Dockerfile.21 .
diff --git a/docker/cross-linux-x64/Dockerfile.21 b/docker/cross-linux-x64/Dockerfile.21
new file mode 100644
index 0000000..0b788d4
--- /dev/null
+++ b/docker/cross-linux-x64/Dockerfile.21
@@ -0,0 +1,4 @@
+FROM yosyshq/cross-linux-x64:2.0
+
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
diff --git a/docker/cross-linux-x64/build.sh b/docker/cross-linux-x64/build.sh
index 97345bd..316bb41 100755
--- a/docker/cross-linux-x64/build.sh
+++ b/docker/cross-linux-x64/build.sh
@@ -1 +1 @@
-docker build -t="yosyshq/cross-linux-x64:2.0" -f Dockerfile .
+docker build -t="yosyshq/cross-linux-x64:2.1" -f Dockerfile.21 .
diff --git a/docker/cross-windows-x64/Dockerfile.21 b/docker/cross-windows-x64/Dockerfile.21
new file mode 100644
index 0000000..67596a9
--- /dev/null
+++ b/docker/cross-windows-x64/Dockerfile.21
@@ -0,0 +1,6 @@
+FROM yosyshq/cross-windows-x64:2.0
+
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup toolchain install nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup override set nightly
+RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo rustup target add x86_64-pc-windows-gnu
+RUN dnf install -y  openssl
\ No newline at end of file
diff --git a/docker/cross-windows-x64/build.sh b/docker/cross-windows-x64/build.sh
index 108bec3..6721c60 100755
--- a/docker/cross-windows-x64/build.sh
+++ b/docker/cross-windows-x64/build.sh
@@ -1 +1 @@
-docker build -t="yosyshq/cross-windows-x64:2.0" -f Dockerfile .
+docker build -t="yosyshq/cross-windows-x64:2.1" -f Dockerfile.21 .
diff --git a/src/base.py b/src/base.py
index c27381e..4dc5c0d 100644
--- a/src/base.py
+++ b/src/base.py
@@ -424,7 +424,7 @@ def executeBuild(target, arch, prefix, build_dir, output_dir, nproc, pack_source
 		else:
 			params += ['-e', '{}={}'.format(i, j)]
 	params += [
-		'yosyshq/cross-'+ arch + ':2.0',
+		'yosyshq/cross-'+ arch + ':2.1',
 		'bash', scriptfile.name
 	]
 	return run_live(params, cwd=build_dir)