diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 09a2c33e0..d0715f2e0 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -11,6 +11,9 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     if: github.repository == 'misskey-dev/misskey'
+    strategy:
+      matrix:
+        arch: [linux/amd64, linux/arm64]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
@@ -18,7 +21,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2.3.0
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.arch }}
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -35,7 +38,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
+          platforms: ${{ matrix.arch }}
           provenance: false
           tags: misskey/misskey:develop
           labels: develop
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a465d92ea..e4440303d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -9,7 +9,9 @@ jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        arch: [linux/amd64, linux/arm64]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
@@ -17,7 +19,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2.3.0
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.arch }}
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -41,7 +43,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
+          platforms: ${{ matrix.arch }}
           provenance: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}