diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index 264c7ceba..165808cd2 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -48,9 +48,9 @@ values:
         passwordKey: password
   backend:
     image:
-      pullPolicy: IfNotPresent
+      pullPolicy: Always
       repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-      tag: 'backend-pr-{{ .SHA }}' 
+      tag: 'backend-pr-{{ .BRANCH }}' 
   exporter:
     # Unlikely to be used 
     enabled: false
@@ -58,9 +58,9 @@ values:
     labels:
       portService: tokens-studio-for-penpot
     image:
-      pullPolicy: IfNotPresent
+      pullPolicy: Always
       repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-      tag: 'frontend-pr-{{ .SHA }}'
+      tag: 'frontend-pr-{{ .BRANCH }}'
     ingress:     
       enabled: true
       annotations:
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index a238c0e7c..f93163f2a 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -41,7 +41,7 @@ jobs:
       uses: docker/metadata-action@v5
       with:
         tags: |
-          type=sha,format=long,prefix=${{matrix.type}}-
+          type=ref,enable=true,priority=600,prefix=${{matrix.type}}-,suffix=,event=branch
         images: |
           ghcr.io/tokens-studio/tokens-studio-for-penpot
     - name: prebuild