diff --git a/clusters/cl01tl/applications/penpot/values.yaml b/clusters/cl01tl/applications/penpot/values.yaml
index 6c44b1dc6..51655d591 100644
--- a/clusters/cl01tl/applications/penpot/values.yaml
+++ b/clusters/cl01tl/applications/penpot/values.yaml
@@ -35,22 +35,7 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://$(PENPOT_DATABASE_HOST):$(PENPOT_DATABASE_PORT)/$(PENPOT_DATABASE_DATABASE)
-            - name: PENPOT_DATABASE_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: host
-            - name: PENPOT_DATABASE_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: port
-            - name: PENPOT_DATABASE_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: dbname
+              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -126,22 +111,7 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://$(PENPOT_DATABASE_HOST):$(PENPOT_DATABASE_PORT)/$(PENPOT_DATABASE_DATABASE)
-            - name: PENPOT_DATABASE_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: host
-            - name: PENPOT_DATABASE_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: port
-            - name: PENPOT_DATABASE_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: dbname
+              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -225,22 +195,7 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://$(PENPOT_DATABASE_HOST):$(PENPOT_DATABASE_PORT)/$(PENPOT_DATABASE_DATABASE)
-            - name: PENPOT_DATABASE_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: host
-            - name: PENPOT_DATABASE_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: port
-            - name: PENPOT_DATABASE_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
-                  key: dbname
+              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef: