diff --git a/scripts/build.sh b/scripts/build.sh
index e4a23ff..ac68511 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -euxo pipefail
 
-devcontainer build --platform linux/aarch64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer
+devcontainer build --platform linux/arm64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer
 devcontainer build --platform linux/amd64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer
diff --git a/scripts/publish.sh b/scripts/publish.sh
index 6bca3f4..1dbca82 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -15,5 +15,5 @@ for IMAGE in "${IMAGES[@]}"; do
     DEVCONTAINER_CALL+=" $IMAGE"
 done
 
-eval "$DEVCONTAINER_CALL --platform linux/aarch64"
+eval "$DEVCONTAINER_CALL --platform linux/arm64"
 eval "$DEVCONTAINER_CALL --platform linux/amd64"
diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
index 1e0a2fa..f048854 100755
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
@@ -47,7 +47,7 @@ rm /tmp/bazelisk.deb
 
 # Pre-install a fixed Bazel version, setup the bash command completion
 export USE_BAZEL_VERSION=${bazel_version}
-bazel help completion bash > /tmp/bazel-complete.bash
+bazel help completion > /tmp/bazel-complete.bash
 ls -lah /tmp/bazel-complete.bash
 mkdir -p /etc/bash_completion.d
 mv /tmp/bazel-complete.bash /etc/bash_completion.d/bazel-complete.bash
diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh
index 642fbff..0ffd36a 100755
--- a/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh
+++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 if [ -f .bazelversion ] && [ "$(cat .bazelversion)" != "$(bazel version | grep 'Build label:' | awk '{print $3}')" ]; then
     # Pre-install the matching Bazel version, setup the bash command completion
     USE_BAZEL_VERSION=$(cat .bazelversion)
-    bazel help completion bash > /tmp/bazel-complete.bash
+    bazel help completion > /tmp/bazel-complete.bash
     sudo mv /tmp/bazel-complete.bash /etc/bash_completion.d/bazel-complete.bash
     sudo sed -i '/^USE_BAZEL_VERSION=/c\USE_BAZEL_VERSION=${USE_BAZEL_VERSION}' /etc/profile.d/bazel.sh || true
 fi