@@ -14,15 +14,22 @@ jobs:
           - {
             name: Linux,
             arch: x86_64,
+            docker-arch: linux/amd64,
+            docker-image: eclipse-temurin:11,
             image: ubuntu-latest,
             cmake: "-DCMAKE_CXX_FLAGS='-march=x86-64'"
           }
-          #          - {
-          #            name: Linux,
-          #            arch: aarch64,
-          #            image: ubuntu-latest,
-          #            cmake: "-DCMAKE_CXX_FLAGS='-march=armv8-a'"
-          #          }
+          - {
+            # Sure do love the many ways to refer to ARM 64 bit
+            # The platform passed to docker must be linux/arm64 to pull in the right image
+            # But then we need aarch64 for the CMake invocation. Maybe we can switch CMake to using arm64?
+            name: Linux,
+            docker-arch: linux/arm64,
+            docker-image: eclipse-temurin:11,
+            arch: aarch64,
+            image: ubuntu-latest,
+            cmake: "-DCMAKE_CXX_FLAGS='-march=armv8-a'"
+          }
           - {
             name: Mac,
             arch: x86_64,
@@ -52,23 +59,41 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+      - name: Set up QEMU
+        if: ${{ matrix.target.name == 'Linux' }}
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: ${{ matrix.target.docker-arch }}
       - name: CMake (Windows)
         if: ${{ matrix.target.name == 'Windows' }}
         shell: cmd
         run: |
           cd scripts && .\build.bat ${{ matrix.target.cmake }} -DOS_NAME=${{ matrix.target.name }} -DOS_ARCH=${{ matrix.target.arch }}
-      - name: CMake (Unix)
-        if: ${{ matrix.target.name != 'Windows' }}
+      - name: CMake (Linux)
+        if: ${{ matrix.target.name == 'Linux' }}
+        run: |
+          docker run \
+            --rm \
+            -v $(pwd):/${{ github.workspace }} \
+            -w ${{ github.workspace }} \
+            --platform ${{ matrix.target.docker-arch }} \
+            ${{ matrix.target.docker-image }} \
+            sh -c "apt-get update && apt-get install -y cmake openjdk-11-jdk git build-essential && cd scripts && ./build.sh ${{ matrix.target.cmake }} -DOS_NAME=${{ matrix.target.name }} -DOS_ARCH=${{ matrix.target.arch }}"
+            # The above apt-get commands can be moved to a Dockerfile, but then
+            # the image needs to be built for the docker-arch architecture,
+            # which means using the docker/setup-buildx-action
+      - name: CMake (Mac)
+        if: ${{ matrix.target.name == 'Mac' }}
         shell: bash
         run: |
           cd scripts && ./build.sh ${{ matrix.target.cmake }} -DOS_NAME=${{ matrix.target.name }} -DOS_ARCH=${{ matrix.target.arch }}
-      - name: Upload Unix Artifact
+      - name: Upload Windows Artifact
         if: ${{ matrix.target.name == 'Windows' }}
         uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: ${{ github.workspace }}\src\main\resources\de\kherud\llama\
-      - name: Upload Windows Artifact
+      - name: Upload Unix Artifact
         if: ${{ matrix.target.name != 'Windows' }}
         uses: actions/upload-artifact@v3
         with: