diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index e395957a79..e87f16fa86 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -36,17 +36,13 @@ dist: .artifacts/goreleaser
 
 dockers:
 - image_templates:
-  - ghcr.io/zitadel/zitadel:latest-amd64
   - ghcr.io/zitadel/zitadel:{{ .Tag }}-amd64
-  - ghcr.io/zitadel/zitadel:{{ .ShortCommit }}-amd64
   - europe-docker.pkg.dev/zitadel-common/zitadel-repo/zitadel:{{ .Tag }}-amd64
-  - europe-docker.pkg.dev/zitadel-common/zitadel-repo/zitadel:{{ .ShortCommit }}-amd64
   use: buildx
   dockerfile: build/Dockerfile
   build_flag_templates:
   - "--platform=linux/amd64"
 - image_templates:
-    - ghcr.io/zitadel/zitadel:latest-arm64
     - ghcr.io/zitadel/zitadel:{{ .Tag }}-arm64
     - ghcr.io/zitadel/zitadel:{{ .ShortCommit }}-arm64
   use: buildx
@@ -54,6 +50,18 @@ dockers:
   build_flag_templates:
   - "--platform=linux/arm64"
 
+docker_manifests:
+  id: zitadel-latest
+  name_template: ghcr.io/zitadel/zitadel:latest
+  image_templates:
+  - ghcr.io/zitadel/zitadel:{{ .Tag }}-amd64
+  - ghcr.io/zitadel/zitadel:{{ .Tag }}-arm64
+  id: zitadel-Tag
+  name_template: ghcr.io/zitadel/zitadel:{{ .Tag }}
+  image_templates:
+  - ghcr.io/zitadel/zitadel:{{ .Tag }}-amd64
+  - ghcr.io/zitadel/zitadel:{{ .Tag }}-arm64
+
 archives:
   - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     replacements: