diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index ce4e435a..5fcc2b6c 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -55,7 +55,7 @@ jobs:
           repository_owner: ${{ github.repository_owner }}
           repository: ${{ github.repository }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          version: ${{ github.ref_name }}
+          version: ${{ github.head_ref || github.ref_name }}
 
   teslamate_merge:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/ghcr_build.yml b/.github/workflows/ghcr_build.yml
index 2890ba5e..9cf8e53e 100644
--- a/.github/workflows/ghcr_build.yml
+++ b/.github/workflows/ghcr_build.yml
@@ -50,7 +50,7 @@ jobs:
           repository_owner: ${{ github.repository_owner }}
           repository: ${{ github.repository }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          version: ${{ github.ref_name }}
+          version: ${{ github.head_ref || github.ref_name }}
           labels: |
             org.opencontainers.image.version=${{ github.ref || github.ref_name }}