diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 135551a..7388931 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -21,9 +21,8 @@ jobs:
       - id: set-matrix
         run: echo "matrix=$(jq -c . build_versions.json)" >> $GITHUB_OUTPUT
 
-  build-ARM-container:
-    # runs-on: hetzner-arm
-    runs-on: ubuntu-latest
+  build-X86-container:
+    runs-on: macarne
     permissions:
       contents: read
       packages: write
@@ -38,7 +37,7 @@ jobs:
           build_args: |
             BASE_IMAGE=${{ matrix.base_image }}
             RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
-            RUBYGEM_FACTER=${{ matrix.facter_version }}
+            RUBYGEM_FACTER=${{ matrix.rubygem_facter }}
             RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli_test }}
             RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli_acceptance }}
             RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli_release }}
@@ -46,7 +45,7 @@ jobs:
             RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
             RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop_performance }}
             RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
-          build_arch: linux/arm64
+          build_arch: linux/amd64
           docker_username: voxpupulibot
           docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
           tags: |
@@ -59,9 +58,8 @@ jobs:
             docker.io/voxpupuli/voxbox:${{ matrix.puppet_release }}
             docker.io/voxpupuli/voxbox:latest
 
-  build-X86-container:
-    # runs-on: macarne
-    runs-on: ubuntu-latest
+  build-ARM-container:
+    runs-on: hetzner-arm
     permissions:
       contents: read
       packages: write
@@ -76,7 +74,7 @@ jobs:
           build_args: |
             BASE_IMAGE=${{ matrix.base_image }}
             RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
-            RUBYGEM_FACTER=${{ matrix.rubygem_facter }}
+            RUBYGEM_FACTER=${{ matrix.facter_version }}
             RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli_test }}
             RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli_acceptance }}
             RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli_release }}
@@ -84,7 +82,7 @@ jobs:
             RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
             RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop_performance }}
             RUBYGEM_BUNDLER=${{ matrix.rubygem_bundler }}
-          build_arch: linux/amd64
+          build_arch: linux/arm64
           docker_username: voxpupulibot
           docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
           tags: |
@@ -97,6 +95,12 @@ jobs:
             docker.io/voxpupuli/voxbox:${{ matrix.puppet_release }}
             docker.io/voxpupuli/voxbox:latest
 
+  update-dockerhub-description:
+    runs-on: ubuntu-latest
+    needs:
+      - build-X86-container
+      - build-ARM-container
+    steps:
       - name: Update Docker Hub Description
         uses: peter-evans/dockerhub-description@v4
         with: