diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
index 6adcb1b8c4b..8cec91eb1bd 100644
--- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml
+++ b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
@@ -84,7 +84,7 @@ jobs:
             *.args.BASE_IMAGE=${{ needs.load-env.outputs[format('{0}', matrix.base_image_env)] }}
             *.args.SETUP_ARGS=${{ matrix.setup-args }}
             *.args.LIB_DIR=${{ matrix.lib_dir }}
-            *.args.ARCH=$(echo "$platform" | cut -d'/' -f2)
+            *.args.ARCH: ${{ env.platform.split('/')[1] }}
           tag-suffix: ${{ matrix.additional-tag-suffix }}
           tag-arch: -arm64
           tag-prefix: ${{ needs.load-env.outputs.rosdistro }}
diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
index 1cb88f72c70..3d626e1ed70 100644
--- a/.github/workflows/docker-build-and-push-main.yaml
+++ b/.github/workflows/docker-build-and-push-main.yaml
@@ -79,7 +79,7 @@ jobs:
             *.args.BASE_IMAGE=${{ needs.load-env.outputs[format('{0}', matrix.base_image_env)] }}
             *.args.SETUP_ARGS=${{ matrix.setup-args }}
             *.args.LIB_DIR=${{ matrix.lib_dir }}
-            *.args.ARCH=$(echo "$platform" | cut -d'/' -f2)
+            *.args.ARCH: ${{ env.platform.split('/')[1] }}
           tag-suffix: ${{ matrix.additional-tag-suffix }}
           tag-arch: -amd64
           tag-prefix: ${{ needs.load-env.outputs.rosdistro }}