diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 044f5eb..2f28b21 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,7 +57,23 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.3.0
 
-      - name: Build and Push
+      - name: Build (test build linux/arm64)
+        uses: docker/build-push-action@v5.3.0
+        with:
+          labels: |
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.source=${{ github.repositoryUrl }}
+            org.opencontainers.image.version=${{ matrix.version }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.licenses=${{ github.event.repository.license.name }}
+          tags: ${{ steps.prep.outputs.test_tag }}
+          platforms: linux/arm64
+          context: .
+          file: ./Dockerfile.${{ matrix.os }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build (test build linux/amd64)
         uses: docker/build-push-action@v5.3.0
         with:
           load: true
@@ -82,7 +98,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and Push
+      - name: Build and Push (linux/amd64,linux/arm64)
         uses: docker/build-push-action@v5.3.0
         with:
           labels: |