diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index bb5aa36..b37cb47 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -63,14 +63,9 @@ jobs:
           path: |
             backend/
             frontend/public
-  
-
   build-docker:
     needs: build
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goarch: [ 'amd64', 'arm64' ]  # Define architectures here
     if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -96,9 +91,7 @@ jobs:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
-          platforms: linux/${{ matrix.goarch }}
-          build-args: |
-            TARGETARCH=${{ matrix.goarch }}
+          platforms: linux/amd64,linux/arm64
   release:
     needs: helm-release
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
index 69132af..f79c840 100644
--- a/.github/workflows/release-prod.yml
+++ b/.github/workflows/release-prod.yml
@@ -57,13 +57,9 @@ jobs:
           path: |
             backend/
             frontend/public
-
   build-docker:
     needs: build
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goarch: [ 'amd64', 'arm64' ]  # Define architectures here
     if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -75,7 +71,6 @@ jobs:
         with:
           name: production-artifacts-${{matrix.goarch}}
           merge-multiple: true
-
       - name: Set up Docker Build
         uses: docker/setup-buildx-action@v3
 
@@ -90,9 +85,7 @@ jobs:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
-          platforms: linux/${{ matrix.goarch }}
-          build-args: |
-            TARGETARCH=${{ matrix.goarch }}
+          platforms: linux/amd64,linux/arm64
   helm-release:
     needs: build-docker
     # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c52e5b9..a1c1f6f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,9 +60,6 @@ jobs:
   build-docker:
     needs: build
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goarch: [ 'amd64', 'arm64' ]  # Define architectures here
     if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -88,9 +85,7 @@ jobs:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/kubevoyage:${{ env.BRANCH_NAME }}
-          platforms: linux/${{ matrix.goarch }}
-          build-args: |
-            TARGETARCH=${{ matrix.goarch }}
+          platforms: linux/amd64,linux/arm64
   helm-release:
     needs: build-docker
     # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions