diff --git a/.github/workflows/build-push-edge-debug.yaml b/.github/workflows/build-push-edge-debug.yaml
index bb619eb80..ac5cd748c 100644
--- a/.github/workflows/build-push-edge-debug.yaml
+++ b/.github/workflows/build-push-edge-debug.yaml
@@ -37,13 +37,24 @@ jobs:
         with:
           images: parseable/parseable
 
-      - name: Build and push
+      - name: Build and push x86_64
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile.debug
           push: true
           tags: parseable/parseable:edge-debug
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push aarch64
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.debug
+          push: true
+          tags: parseable/parseable:edge-debug
+          platforms: linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/build-push-edge.yaml b/.github/workflows/build-push-edge.yaml
index ccd0bb123..9eb08b07c 100644
--- a/.github/workflows/build-push-edge.yaml
+++ b/.github/workflows/build-push-edge.yaml
@@ -37,13 +37,25 @@ jobs:
         with:
           images: parseable/parseable
 
-      - name: Build and push
+
+      - name: Build and push x86_64
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: parseable/parseable:edge
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push aarch64
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: parseable/parseable
+          platforms: linux/arm64
           cache-from: type=gha
           cache-to: type=gha,mode=max