diff --git a/.github/workflows/dockerhub_sshnpd.yml b/.github/workflows/dockerhub_sshnpd.yml
index 562700db5..ee446bc30 100644
--- a/.github/workflows/dockerhub_sshnpd.yml
+++ b/.github/workflows/dockerhub_sshnpd.yml
@@ -10,7 +10,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
 jobs:
-  docker_arm64:
+  docker_amd64:
     strategy:
       matrix:
         include:
@@ -20,7 +20,7 @@ jobs:
             dockerfile: ./packages/dart/sshnoports/tools/Dockerfile.activate
           - name: sshnpd-slim
             dockerfile: ./packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim
-    runs-on: ubuntu-24.04-arm
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -49,14 +49,14 @@ jobs:
         with:
           context: .
           file: ${{ matrix.dockerfile }}
-          platforms: linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm/v7
           push: true
           provenance: false
           tags: |
             atsigncompany/${{ matrix.name }}:${{ env.VERSION }}
             atsigncompany/${{ matrix.name }}:release-${{ env.VERSION }}
 
-  docker_amd64:
+  docker_arm64:
     strategy:
       matrix:
         include:
@@ -66,7 +66,7 @@ jobs:
             dockerfile: ./packages/dart/sshnoports/tools/Dockerfile.activate
           - name: sshnpd-slim
             dockerfile: ./packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -95,12 +95,12 @@ jobs:
         with:
           context: .
           file: ${{ matrix.dockerfile }}
-          platforms: linux/amd64
+          platforms: linux/arm64
           push: true
           provenance: false
           tags: |
-            atsigncompany/${{ matrix.name }}:amd64-${{ env.VERSION }}
-            atsigncompany/${{ matrix.name }}:amd64-release-${{ env.VERSION }}
+            atsigncompany/${{ matrix.name }}:arm64-${{ env.VERSION }}
+            atsigncompany/${{ matrix.name }}:arm64-release-${{ env.VERSION }}
 
   docker_combine:
     needs: [docker_amd64, docker_arm64]
@@ -127,10 +127,10 @@ jobs:
         run: |
           docker buildx imagetools create \
             -t atsigncompany/${{ matrix.name }}:${{ env.VERSION }} \
-            --append atsigncompany/${{ matrix.name }}:amd64-${{ env.VERSION }}
+            --append atsigncompany/${{ matrix.name }}:arm64-${{ env.VERSION }}
           docker buildx imagetools create \
             -t atsigncompany/${{ matrix.name }}:release-${{ env.VERSION }} \
-            --append atsigncompany/${{ matrix.name }}:amd64-release-${{ env.VERSION }}
+            --append atsigncompany/${{ matrix.name }}:arm64-release-${{ env.VERSION }}
       # Promote to latest so long as this isn't a pre-release
       - name: Update latest tag
         run: |