diff --git a/.github/workflows/build-and-push-image-semver.yaml b/.github/workflows/build-and-push-image-semver.yaml
index e922d91bdde..1da1dda9df3 100644
--- a/.github/workflows/build-and-push-image-semver.yaml
+++ b/.github/workflows/build-and-push-image-semver.yaml
@@ -35,15 +35,10 @@ 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
+          version: v0.22.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 f111e2a0e44..2519d1362d9 100644
--- a/.github/workflows/build-and-push-image.yaml
+++ b/.github/workflows/build-and-push-image.yaml
@@ -54,15 +54,10 @@ 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
+          version: v0.22.0
       
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml
index 7c6b0cc0561..dd628949db5 100644
--- a/.github/workflows/dev-build.yaml
+++ b/.github/workflows/dev-build.yaml
@@ -6,7 +6,7 @@ concurrency:
 
 on:
   push:
-    branches: ['3536-feat-new-chat-home-page'] # put your current branch to create a build. Core team only.
+    branches: ['na'] # put your current branch to create a build. Core team only.
     paths-ignore:
       - '**.md'
       - 'cloud-deployments/*'
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
-          version: v0.19.0
+          version: v0.22.0
       
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a