diff --git a/.github/workflows/build-and-push-image-semver.yaml b/.github/workflows/build-and-push-image-semver.yaml
index 8fb6d35c28475629e4d258d19c81ea5187f2ab27..e922d91bddeb399d5ffad024eb0284198101c4af 100644
--- a/.github/workflows/build-and-push-image-semver.yaml
+++ b/.github/workflows/build-and-push-image-semver.yaml
@@ -35,8 +35,15 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
+      # Since Docker Buildx v20.1 - segfaults occur on arm64 with ubuntu-latest.
+      # So we pin to v0.19.0 for now until the issue is resolved for runners via QEMU.
+      # Alternatively, we can move to ARM runners and remove the QEMU setup, but this previously
+      # has issues (see comment at the top)
+      # https://github.com/NVIDIA/cuda-quantum/pull/2651#issue-2870353124
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: v0.19.0
       
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
diff --git a/.github/workflows/build-and-push-image.yaml b/.github/workflows/build-and-push-image.yaml
index 7c8fc1bc8e8fc1c2920f88480431f50235556022..dd1a89f8211ce74bff18ae664293e02efad93ea9 100644
--- a/.github/workflows/build-and-push-image.yaml
+++ b/.github/workflows/build-and-push-image.yaml
@@ -52,6 +52,11 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
+      # Since Docker Buildx v20.1 - segfaults occur on arm64 with ubuntu-latest.
+      # So we pin to v0.19.0 for now until the issue is resolved for runners via QEMU.
+      # Alternatively, we can move to ARM runners and remove the QEMU setup, but this previously
+      # has issues (see comment at the top)
+      # https://github.com/NVIDIA/cuda-quantum/pull/2651#issue-2870353124
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with: