diff --git a/.github/workflows/atlantis-base.yml b/.github/workflows/atlantis-base.yml
index 59d60b3cc..d56715cb6 100644
--- a/.github/workflows/atlantis-base.yml
+++ b/.github/workflows/atlantis-base.yml
@@ -18,8 +18,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - linux/arm64/v8
+          - linux/amd64
+          - linux/arm/v7
     steps:
     - uses: actions/checkout@v3
 
@@ -44,7 +50,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: docker-base
-        platforms: linux/arm64/v8,linux/amd64,linux/arm/v7
+        platforms: ${{ matrix.platform }}
         push: true
         tags: |
           ghcr.io/${{ github.repository_owner }}/atlantis-base:${{env.TODAY}}
diff --git a/.github/workflows/atlantis-image.yml b/.github/workflows/atlantis-image.yml
index 752ffedcd..6273fbae2 100644
--- a/.github/workflows/atlantis-image.yml
+++ b/.github/workflows/atlantis-image.yml
@@ -16,6 +16,12 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - linux/arm64/v8
+          - linux/amd64
+          - linux/arm/v7
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3
@@ -44,7 +50,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: .
-        platforms: linux/arm64/v8,linux/amd64,linux/arm/v7
+        platforms: ${{ matrix.platform }}
         push: true
         tags: |
           ghcr.io/${{ github.repository_owner }}/atlantis:dev
@@ -59,7 +65,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: .
-        platforms: linux/arm64/v8,linux/amd64,linux/arm/v7
+        platforms: ${{ matrix.platform }}
         push: true
         tags: |
           ghcr.io/${{ github.repository_owner }}/atlantis:${{ env.RELEASE_VERSION }}
@@ -70,7 +76,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: .
-        platforms: linux/arm64/v8,linux/amd64,linux/arm/v7
+        platforms: ${{ matrix.platform }}
         push: true
         tags: |
           ghcr.io/${{ github.repository_owner }}/atlantis:${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/testing-env-image.yml b/.github/workflows/testing-env-image.yml
index 6c27dafc8..2b5c16114 100644
--- a/.github/workflows/testing-env-image.yml
+++ b/.github/workflows/testing-env-image.yml
@@ -16,6 +16,12 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - linux/arm64/v8
+          - linux/amd64
+          - linux/arm/v7
     steps:
     - uses: actions/checkout@v3
 
@@ -40,7 +46,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: testing
-        platforms: linux/arm64/v8,linux/amd64,linux/arm/v7
+        platforms: ${{ matrix.platform }}
         push: true
         tags: |
            ghcr.io/runatlantis/testing-env:${{env.TODAY}}