diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index f5f903669..e4d737a46 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -285,4 +285,4 @@ nfpms:
         replacements:
           arm64: aarch64
           amd64: x86_64
-        file_name_template: '{{ .ProjectName }}-cli-{{ .Version }}-{{ .Release }}_{{ .Arch }}{{ if .Arm }}{{if eq .Arm "7"}}hf{{ end }}{{ end }}'
+        file_name_template: '{{ .ProjectName }}-cli-{{ .Version }}-{{ .Release }}.{{ .Arch }}{{ if .Arm }}{{if eq .Arm "7"}}hf{{ end }}{{ end }}'
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7b206f1d1..675ce9faf 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -84,11 +84,8 @@ jobs:
       - name: Publish latest tag
         if: "env.LATEST_TAG == steps.tagName.outputs.tag"
         run: |
-          docker tag pomerium/pomerium:${{ env.LATEST_TAG }} pomerium/pomerium:latest
-          docker push pomerium/pomerium:latest
-
-          docker tag pomerium/pomerium:arm64v8-${{ env.LATEST_TAG }} pomerium/pomerium:arm64v8-latest
-          docker push pomerium/pomerium:arm64v8-latest
+          docker manifest create -a pomerium/pomerium:latest pomerium/pomerium:amd64-${{ env.LATEST_TAG }} pomerium/pomerium:arm64v8-${{ env.LATEST_TAG }}
+          docker manifest push pomerium/pomerium:latest
 
           docker tag gcr.io/pomerium-io/pomerium:${{ env.LATEST_TAG }}-cloudrun gcr.io/pomerium-io/pomerium:latest-cloudrun
           docker push gcr.io/pomerium-io/pomerium:latest-cloudrun