diff --git a/.github/actions/buildx-setup/action.yaml b/.github/actions/buildx-setup/action.yaml
index 282ca5c..e09fc03 100644
--- a/.github/actions/buildx-setup/action.yaml
+++ b/.github/actions/buildx-setup/action.yaml
@@ -13,9 +13,5 @@ runs:
       with:
         install: true
 
-    - name: Get release version
-      id: version_number
-      shell: bash
-      run: |
-        echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-        echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_OUTPUT
+    # Release version setup
+    - uses: ./.github/actions/get-release-version
diff --git a/.github/actions/get-release-version/action.yaml b/.github/actions/get-release-version/action.yaml
new file mode 100644
index 0000000..a98f499
--- /dev/null
+++ b/.github/actions/get-release-version/action.yaml
@@ -0,0 +1,14 @@
+name: 'Get release version'
+description: 'Setup RELEASE_VERSION environment variable from GITHUB_REF'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get release version
+      id: version_number
+      shell: bash
+      run: |
+        echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+        echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_OUTPUT
+        echo "RELEASE_VERSION_NO_v=${GITHUB_REF:11}" >> $GITHUB_ENV
+        echo "RELEASE_VERSION_NO_v=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 92caf50..fbe19c1 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -51,6 +51,7 @@ jobs:
         with:
           repository: kumina/postfix_exporter
           path: 'postfix_exporter'
+          ref: 'a6f58e9b2b2b4decc7e65c5a34b4fd53cd6665f1' # Latest commit we know that works
 
       # Buildkit setup
       - uses: ./.github/actions/buildx-setup
diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
index 80c170f..510b671 100644
--- a/.github/workflows/tags.yml
+++ b/.github/workflows/tags.yml
@@ -75,7 +75,7 @@ jobs:
           push: true
           tags: |
             boky/postfix-exporter:${{ env.RELEASE_VERSION }}
-            boky/postfix-exporter:${{ env.RELEASE_VERSION }}
+            boky/postfix-exporter:${{ env.RELEASE_VERSION_NO_v }}
           platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
           cache-from: type=local,src=/tmp/.buildx-cache/postfix-exporter,mode=max,compression=estargz
           cache-to: type=local,dest=/tmp/.buildx-cache-new/postfix-exporter
@@ -127,6 +127,8 @@ jobs:
           tags: |
             boky/postfix:${{ env.RELEASE_VERSION }}
             boky/postfix:${{ env.RELEASE_VERSION }}-alpine
+            boky/postfix:${{ env.RELEASE_VERSION_NO_v }}
+            boky/postfix:${{ env.RELEASE_VERSION_NO_v }}-alpine
           # linux/s390x: "rsyslog (no such package)"
           # Latest Alpine does not have all packages for 386 any more :-(
           platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le"
@@ -175,7 +177,9 @@ jobs:
         with:
           context: .
           push: true
-          tags: boky/postfix:${{ env.RELEASE_VERSION }}-ubuntu
+          tags: |
+            boky/postfix:${{ env.RELEASE_VERSION }}-ubuntu
+            boky/postfix:${{ env.RELEASE_VERSION_NO_v }}-ubuntu
           platforms: "linux/arm/v7,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
           cache-from: type=local,src=/tmp/.buildx-cache/ubuntu,mode=max,compression=estargz
           cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
@@ -203,12 +207,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get release version
-        id: version_number
-        shell: bash
-        run: |
-          echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_OUTPUT
+      # Release version setup
+      - uses: ./.github/actions/get-release-version
 
       - name: Checkout gh-pages
         uses: actions/checkout@v4
@@ -238,7 +238,7 @@ jobs:
       - name: Package helm chart with X.Y.Z
         uses: WyriHaximus/github-action-helm3@v3
         with:
-          exec: helm package --app-version "${RELEASE_VERSION#v}" --version "${RELEASE_VERSION#v}" --destination ./gh-pages helm/mail
+          exec: helm package --app-version "${RELEASE_VERSION_NO_v}" --version "${RELEASE_VERSION_NO_v}" --destination ./gh-pages helm/mail
 
       - name: Create helm chart index
         uses: WyriHaximus/github-action-helm3@v3