diff --git a/.goreleaser.yml b/.goreleaser.yml
index bd9a09dcdc5f7d25ed32dba5d349cef18e043e6f..5fac2d49539071d4e4c16668bd3bc403be9a837c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -25,17 +25,16 @@ archives:
     wrap_in_directory: true
 
 dockers:
-  - ids:
-      - hcloud-cloud-controller-manager
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "hetznercloud/hcloud-cloud-controller-manager:latest"
-      - "hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}"
+  - build_flag_templates: [--platform=linux/amd64]
     dockerfile: Dockerfile
+    goarch: amd64
+    image_templates: ["hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}-amd64"]
     use: buildx
-    build_flag_templates:
-      - "--platform=linux/amd64"
+
+docker_manifests:
+  - name_template: hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}
+    image_templates:
+      - hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}-amd64
 
 release:
   ids: [""]
diff --git a/Dockerfile b/Dockerfile
index 4a1292ca9e9150d80ac3a8194a7ede3964e47ae6..f107bb95638b434cc53ab0e9110ec8a1d58832ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM --platform=$BUILDPLATFORM alpine:3.17
 RUN apk add --no-cache ca-certificates bash
 COPY hcloud-cloud-controller-manager /bin/hcloud-cloud-controller-manager
-ENTRYPOINT ["/bin/hcloud-cloud-controller-manager"]
\ No newline at end of file
+ENTRYPOINT ["/bin/hcloud-cloud-controller-manager"]