diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4ecd9dd1644b20116eabde9f1e2d6eceb0e4cf07..5efb6efb977079cb265a216e763b95706d127aaa 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -4,7 +4,7 @@
 before:
   hooks:
     - go mod tidy
-    - ./scripts/release-generate-deployment-yamls.sh {{ if not .IsSnapshot }}v{{ end }}{{ .Version }}
+    - ./scripts/release-generate-deployment-yamls.sh {{ .Version }}
 
 builds:
   - id: hcloud-cloud-controller-manager
@@ -59,6 +59,6 @@ publishers:
     ids: [""]
     checksum: true
 
-    cmd: ./scripts/publish-helm-chart.sh hcloud-cloud-controller-manager-{{ if not .IsSnapshot }}v{{ end }}{{ .Version }}.tgz
+    cmd: ./scripts/publish-helm-chart.sh hcloud-cloud-controller-manager-{{ .Version }}.tgz
     env:
       - CHART_REPO_REMOTE={{ .Env.CHART_REPO_REMOTE }}
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 20f9b3cdab7e91ce4e957ef3a0e439c3dc84b17a..347e5d67cafdfa2f8374818c0e8fa0e9673da0b8 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: hcloud-cloud-controller-manager
 type: application
-version: v1.18.0 # x-release-please-version
+version: 1.18.0 # x-release-please-version
diff --git a/chart/values.yaml b/chart/values.yaml
index 2f9163103882c24044d023c9f049e87e189cab39..795109d51948bda91698863508ead4046bd6a728 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -50,7 +50,7 @@ env:
 
 image:
   repository: hetznercloud/hcloud-cloud-controller-manager
-  tag: '{{ $.Chart.Version }}'
+  tag: 'v{{ $.Chart.Version }}'
 
 monitoring:
   # When enabled, the hccm Pod will serve metrics on port :8233