diff --git a/.goreleaser.yml b/.goreleaser.yml
index acc66e6ac..57b01895e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,7 +9,7 @@ before:
     - ./scripts/release-generate-deployment-yamls.sh {{ .Version }}
 
 builds:
-  - id: hcloud-cloud-controller-manager
+  - id: binary
     env:
       - CGO_ENABLED=0
     goos:
@@ -26,19 +26,22 @@ builds:
       - -X k8s.io/component-base/version.gitVersion=v0.0.0-master+v{{ .Version }}
 
 dockers:
-  - build_flag_templates: [--platform=linux/amd64]
+  - id: docker-amd64
+    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/arm64]
+  - id: docker-arm64
+    build_flag_templates: [--platform=linux/arm64]
     dockerfile: Dockerfile
     goarch: arm64
     image_templates:
       - hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}-arm64v8
     use: buildx
-  - build_flag_templates: [--platform=linux/arm/v6]
+  - id: docker-armv6
+    build_flag_templates: [--platform=linux/arm/v6]
     dockerfile: Dockerfile
     goarch: arm
     goarm: 6
@@ -47,16 +50,17 @@ dockers:
     use: buildx
 
 docker_manifests:
-  - name_template: hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}
+  - id: docker-manifest
+    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
       - hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}-arm64v8
       - hetznercloud/hcloud-cloud-controller-manager:{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}-armv6
 
 archives:
-  - id: hcloud-cloud-controller-manager-archive
-    builds:
-      - hcloud-cloud-controller-manager
+  - id: archive
+    ids:
+      - binary
     name_template: "{{ .Binary }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     files:
       - LICENSE
@@ -64,17 +68,16 @@ archives:
 
 release:
   ids:
-    - hcloud-cloud-controller-manager-archive
+    - archive
   extra_files:
     - glob: ./deploy/ccm*.yaml
     - glob: ./hcloud-cloud-controller-manager-*.tgz
 
 publishers:
-  - name: helm-chart-repo
+  - name: publish-helm-chart
 
-    # make sure that this is only executed once. There are no separate ids per binary built,
-    # we filter for no actual ID and then run the publisher for the checksum.
-    ids: [""]
+    # Only execute once by filtering all ids, and only running for the checksum.
+    ids: ["none"]
     checksum: true
 
     cmd: ./scripts/publish-helm-chart.sh hcloud-cloud-controller-manager-{{ .Version }}.tgz
diff --git a/scripts/publish-helm-chart.sh b/scripts/publish-helm-chart.sh
index d6184ed5a..d649fce12 100755
--- a/scripts/publish-helm-chart.sh
+++ b/scripts/publish-helm-chart.sh
@@ -13,11 +13,18 @@ if [[ -z "$CHART_FILE" ]]; then
   exit 1
 fi
 
-TMP_DIR=$(mktemp --directory hccm-chart-repo.XXXXX)
+TMP_DIR=$(mktemp --directory chart-repo.XXXXX)
+# shellcheck disable=SC2064
+trap "rm -Rf '$(realpath "$TMP_DIR")'" EXIT
 
 git clone --depth 1 -b "${CHART_REPO_BRANCH}" "${CHART_REPO_REMOTE}" "${TMP_DIR}"
 
-mkdir "${TMP_DIR}"/new-chart
+if [[ -f "${TMP_DIR}/${CHART_FILE}" ]]; then
+  echo "chart file already exists: ${CHART_FILE}"
+  exit 0
+fi
+
+mkdir "${TMP_DIR}/new-chart"
 cp "${CHART_FILE}" "${TMP_DIR}/new-chart"
 
 pushd "${TMP_DIR}/new-chart"
@@ -41,4 +48,3 @@ git commit -m "feat: add ${CHART_FILE}"
 git push
 
 popd
-rm -rf "${TMP_DIR}"