diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index cda9f6e0e..40d35c18b 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -63,7 +63,7 @@ values:
     image:
       pullPolicy: Always
       repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-      tag: 'backend-pr-{{ .BRANCH | sanitizeDNSName }}' 
+      tag: 'pr-backend-{{ .BRANCH | sanitizeDNSName }}' 
   exporter:
     # Unlikely to be used 
     enabled: false
@@ -73,7 +73,7 @@ values:
     image:
       pullPolicy: Always
       repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-      tag: 'frontend-pr-{{ .BRANCH | sanitizeDNSName }}'
+      tag: 'pr-frontend-{{ .BRANCH | sanitizeDNSName }}'
     ingress:     
       enabled: true
       annotations: