diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
index 754b3e0fa..6c027ad9e 100644
--- a/.github/workflows/build-base-images.yml
+++ b/.github/workflows/build-base-images.yml
@@ -69,7 +69,8 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      - name: qemu workaround
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -90,7 +91,7 @@ jobs:
         with:
           context: .
           file: ci/base-images/sle/Dockerfile.dotnet6
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta-bci-dotnet.outputs.tags }}
           labels: ${{ steps.meta-bci-dotnet.outputs.labels }}
@@ -108,7 +109,8 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      - name: qemu workaround
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -130,7 +132,7 @@ jobs:
         with:
           context: .
           file: ci/base-images/cdxgen/Dockerfile.dotnet6
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ghcr.io/cyclonedx/cdxgen-dotnet:v11,ghcr.io/cyclonedx/cdxgen-dotnet6:v11
           labels: ${{ steps.meta-cdxgen-dotnet.outputs.labels }}
@@ -141,7 +143,7 @@ jobs:
         with:
           context: .
           file: ci/base-images/cdxgen/Dockerfile.dotnet6
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta-cdxgen-dotnet.outputs.tags }}
           labels: ${{ steps.meta-cdxgen-dotnet.outputs.labels }}
@@ -248,7 +250,8 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      - name: qemu workaround
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -286,7 +289,8 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      - name: qemu workaround
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -512,12 +516,12 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+      - name: qemu workaround
+        run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -c yes
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with: