diff --git a/.github/workflows/wheel_image.yml b/.github/workflows/wheel_image.yml
index b53b884b63..3d2a097dd2 100644
--- a/.github/workflows/wheel_image.yml
+++ b/.github/workflows/wheel_image.yml
@@ -28,20 +28,22 @@ on:
 
       tag:
         description: 'The tag for the final Docker image'
-        default: 'latest'
+        default: 'latest-'
         required: true
 
 jobs:
   docker:
     name: 'Create Docker image for manylinux wheels'
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.base_image }}
     strategy:
       matrix:
         include:
           - platform: 'linux/amd64'
             arch: 'x86_64'
+            base_image: 'ubuntu-22.04'
           - platform: 'linux/arm64'
             arch: 'aarch64'
+            base_image: 'ubuntu-22.04-arm'
 
     steps:
       - name: Login to Docker Hub
@@ -59,18 +61,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:packaging/python"
           platforms: ${{ matrix.platform }}
           push: ${{ github.event.inputs.upload }}
-          tags: ${{ github.event.inputs.container_registry }}/neuronsimulator/neuron_wheel:${{ github.event.inputs.tag }}-${{ matrix.arch }}
+          tags: ${{ github.event.inputs.container_registry }}/neuronsimulator/neuron_wheel:${{ github.event.inputs.tag }}${{ github.event.inputs.base_image }}_${{ matrix.arch }}
           build-args: |
             MANYLINUX_IMAGE=${{ github.event.inputs.base_image }}_${{ matrix.arch }}