diff --git a/substrate/core/executor/wasm/build.sh b/substrate/core/executor/wasm/build.sh
index ab71864481..ecd7b67540 100755
--- a/substrate/core/executor/wasm/build.sh
+++ b/substrate/core/executor/wasm/build.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-cargo +nightly build --target=wasm32-unknown-unknown --release
+if cargo --version | grep -q "nightly"; then
+	CARGO_CMD="cargo"
+else
+	CARGO_CMD="cargo +nightly"
+fi
+$CARGO_CMD build --target=wasm32-unknown-unknown --release
 for i in test
 do
 	wasm-gc target/wasm32-unknown-unknown/release/runtime_$i.wasm target/wasm32-unknown-unknown/release/runtime_$i.compact.wasm
diff --git a/substrate/core/test-runtime/wasm/build.sh b/substrate/core/test-runtime/wasm/build.sh
index 63d9347bf4..24a0d162da 100755
--- a/substrate/core/test-runtime/wasm/build.sh
+++ b/substrate/core/test-runtime/wasm/build.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-cargo +nightly build --target=wasm32-unknown-unknown --release
+if cargo --version | grep -q "nightly"; then
+	CARGO_CMD="cargo"
+else
+	CARGO_CMD="cargo +nightly"
+fi
+$CARGO_CMD build --target=wasm32-unknown-unknown --release
 for i in substrate_test_runtime
 do
 	wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm
diff --git a/substrate/node/runtime/wasm/build.sh b/substrate/node/runtime/wasm/build.sh
index 9fe3f0ca10..8cabead3fa 100755
--- a/substrate/node/runtime/wasm/build.sh
+++ b/substrate/node/runtime/wasm/build.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-cargo +nightly build --target=wasm32-unknown-unknown --release
+if cargo --version | grep -q "nightly"; then
+	CARGO_CMD="cargo"
+else
+	CARGO_CMD="cargo +nightly"
+fi
+$CARGO_CMD build --target=wasm32-unknown-unknown --release
 for i in node_runtime
 do
 	wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm