diff --git a/.github/workflows/ewyles-test-qemu.yaml b/.github/workflows/ewyles-test-qemu.yaml
index 3d909428..7fd3d23e 100644
--- a/.github/workflows/ewyles-test-qemu.yaml
+++ b/.github/workflows/ewyles-test-qemu.yaml
@@ -10,8 +10,14 @@ permissions:
 
 jobs:
   test-qemu:
-#    runs-on: uds-ubuntu-arm64-4-core
-    runs-on: uds-ubuntu-arm64-4-core
+    runs-on: ${{ matrix.architecture == 'arm64' && 'uds-ubuntu-arm64-4-core' || 'ubuntu-latest' }}
+    strategy:
+      matrix:
+        flavor: [upstream, registry1]
+        architecture: [amd64, arm64]
+        exclude:
+          - flavor: registry1
+            architecture: arm64
     name: Test QEMU ${{ matrix.flavor }} ${{ matrix.architecture }}
 
     permissions:
@@ -29,10 +35,11 @@ jobs:
           ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
+        if: ${{ runner.architecture == 'ARM64' }}
         uses: docker/setup-qemu-action@v3
 
       - name: Test Package
-        run: UDS_ARCHITECTURE=arm64 uds run test-package --set FLAVOR=upstream
+        run: UDS_ARCHITECTURE=${{ matrix.architecture }} uds run test-package --set FLAVOR=${{ matrix.flavor }}
 
       - name: Debug Output
         if: ${{ always() }}