diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index ec96eb3cdc..f441093692 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -37,7 +37,7 @@ values:
         secretKeys:
           accessKeyIDKey: CONSOLE_ACCESS_KEY
           secretAccessKey: CONSOLE_SECRET_KEY
-    flags: 'enable-smtp'
+    flags: 'enable-smtp enable-feature-design-tokens'
     smtp:
       enabled: true
       host: mailslurper
diff --git a/.gimlet/penpot-prod.yaml b/.gimlet/penpot-prod.yaml
index 5431b46991..8b09c022dd 100644
--- a/.gimlet/penpot-prod.yaml
+++ b/.gimlet/penpot-prod.yaml
@@ -19,7 +19,7 @@ values:
     secret: db-penpot-secrets
     superUser: db-penpot-superuser-secret
   config:
-    flags: 'enable-smtp'
+    flags: 'enable-smtp enable-feature-design-tokens'
     assets:
       storageBackend: assets-s3
       s3:
@@ -72,4 +72,4 @@ values:
       tls:
         - secretName: tls-penpot
           hosts:
-          - penpot.tokens.studio
\ No newline at end of file
+          - penpot.tokens.studio