diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index 1d75211b3..5c20f01d2 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -120,3 +120,20 @@ dockers:
       - "--label=org.opencontainers.image.source={{.GitURL}}"
       - "--label=repository=http://github.com/pomerium/pomerium"
       - "--label=homepage=http://www.pomerium.io"
+
+  - goarch: arm64
+    image_templates:
+      - "pomerium/pomerium:arm64v8-{{ .Tag }}"
+    dockerfile: .github/Dockerfile-release.arm64v8
+    binaries:
+      - pomerium
+      - pomerium-cli
+    build_flag_templates:
+      - "--pull"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--label=repository=http://github.com/pomerium/pomerium"
+      - "--label=homepage=http://www.pomerium.io"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 625dcea4f..b1e2c4e2d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,11 +58,5 @@ jobs:
           docker tag pomerium/pomerium:${{ env.LATEST_TAG }} pomerium/pomerium:latest
           docker push pomerium/pomerium:latest
 
-          docker tag pomerium/pomerium:arm32v7-${{ env.LATEST_TAG }} pomerium/pomerium:arm32v7-latest
-          docker push pomerium/pomerium:arm32v7-latest
-
-          docker tag pomerium/pomerium:arm32v6-${{ env.LATEST_TAG }} pomerium/pomerium:arm32v6-latest
-          docker push pomerium/pomerium:arm32v6-latest
-
           docker tag pomerium/pomerium:arm64v8-${{ env.LATEST_TAG }} pomerium/pomerium:arm64v8-latest
           docker push pomerium/pomerium:arm64v8-latest