diff --git a/clusters/cl01tl/applications/penpot/values.yaml b/clusters/cl01tl/applications/penpot/values.yaml
index 1cfe13611..48fa27156 100644
--- a/clusters/cl01tl/applications/penpot/values.yaml
+++ b/clusters/cl01tl/applications/penpot/values.yaml
@@ -35,16 +35,16 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
+              value: postgresql://penpot-postgresql-17-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: username
             - name: PENPOT_DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: password
             - name: PENPOT_REDIS_URI
               value: redis://penpot-valkey-headless.penpot.svc.cluster.local:6379/0
@@ -111,16 +111,16 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
+              value: postgresql://penpot-postgresql-17-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: username
             - name: PENPOT_DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: password
             - name: PENPOT_REDIS_URI
               value: redis://penpot-valkey-headless.penpot.svc.cluster.local:6379/0
@@ -195,16 +195,16 @@ penpot:
                   name: penpot-key-secret
                   key: key
             - name: PENPOT_DATABASE_URI
-              value: postgresql://penpot-postgresql-16-cluster-rw:5432/app
+              value: postgresql://penpot-postgresql-17-cluster-rw:5432/app
             - name: PENPOT_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: username
             - name: PENPOT_DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: penpot-postgresql-16-cluster-app
+                  name: penpot-postgresql-17-cluster-app
                   key: password
             - name: PENPOT_REDIS_URI
               value: redis://penpot-valkey-headless.penpot.svc.cluster.local:6379/0
@@ -406,7 +406,7 @@ postgres-16-cluster:
     endpointCredentials: penpot-postgresql-16-cluster-backup-secret
     backupIndex: 1
 postgres-17-cluster:
-  mode: replica
+  mode: standalone
   cluster:
     image:
       repository: ghcr.io/cloudnative-pg/postgresql
@@ -417,21 +417,9 @@ postgres-17-cluster:
       storageClass: local-path
     monitoring:
       enabled: true
-  replica:
-    importType: microservice
-    importDatabases:
-      - app
-    externalCluster:
-      connectionParameters:
-        host: penpot-postgresql-16-cluster-rw
-        user: app
-        dbname: app
-      password:
-        name: penpot-postgresql-16-cluster-app
-        key: password
   backup:
-    enabled: false
+    enabled: true
     endpointURL: https://nyc3.digitaloceanspaces.com
-    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/penpot/penpot-postgresql-16-cluster
-    endpointCredentials: penpot-postgresql-16-cluster-backup-secret
+    destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/penpot/penpot-postgresql-17-cluster
+    endpointCredentials: penpot-postgresql-17-cluster-backup-secret
     backupIndex: 1