diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce618082..f7a6f029 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,19 +12,16 @@ concurrency:
 
 jobs:
   build-test:
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     uses: ./.github/workflows/reusable_build_test_driverkit.yml
     with:
-      arch: amd64
+      arch: ${{ matrix.arch }}
 
-  build-test-arm64:
-    uses: ./.github/workflows/reusable_build_test_driverkit.yml
-    with:
-      arch: arm64
-      
   gomodtidy:
     name: Enforce go.mod tidiness
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c4c33f21..0cf086b4 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -10,32 +10,26 @@ concurrency:
 
 jobs:
   build-test:
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     uses: ./.github/workflows/reusable_build_test_driverkit.yml
     with:
-      arch: amd64
-  
-  build-test-arm64:
-    uses: ./.github/workflows/reusable_build_test_driverkit.yml
-    with:
-      arch: arm64
+      arch: ${{ matrix.arch }}
 
   push-images:
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     uses: ./.github/workflows/reusable_build_push_images.yml
     needs: build-test
     with:
-      arch: amd64
-    secrets: inherit  
-      
-  push-images-arm64:
-    uses: ./.github/workflows/reusable_build_push_images.yml
-    needs: build-test-arm64
-    with:
-      arch: arm64
+      arch: ${{ matrix.arch }}
     secrets: inherit
 
   images:
     uses: ./.github/workflows/reusable_manifest_images.yml
-    needs: [push-images,push-images-arm64]
+    needs: push-images
     secrets: inherit
       
     
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b878ae24..ec115312 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,43 +11,35 @@ permissions:
 
 jobs:
   build-test:
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     uses: ./.github/workflows/reusable_build_test_driverkit.yml
     with:
-      arch: amd64
-  
-  build-test-arm64:
-    uses: ./.github/workflows/reusable_build_test_driverkit.yml
-    with:
-      arch: arm64
+      arch: ${{ matrix.arch }}
 
   push-images:
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
     uses: ./.github/workflows/reusable_build_push_images.yml
     needs: build-test
     with:
-      arch: amd64
+      arch: ${{ matrix.arch }}
       tag: ${{ github.ref_name }}
       is_latest: true
     secrets: inherit  
-      
-  push-images-arm64:
-    uses: ./.github/workflows/reusable_build_push_images.yml
-    needs: build-test-arm64
-    with:
-      arch: arm64
-      tag: ${{ github.ref_name }}
-      is_latest: true
-    secrets: inherit
 
   images:
     uses: ./.github/workflows/reusable_manifest_images.yml
-    needs: [push-images,push-images-arm64]
+    needs: push-images
     with:
       tag: ${{ github.ref_name }}
       is_latest: true
     secrets: inherit
 
   release:
-    needs: [push-images,push-images-arm64]
+    needs: images
     runs-on: ubuntu-latest
     steps:
       - name: Checkout