diff --git a/clusters/cl01tl/manifests/komodo/Deployment-komodo-ferretdb-2.yaml b/clusters/cl01tl/manifests/komodo/Deployment-komodo-ferretdb-2.yaml
index 1ff349eb9..bbd358b69 100644
--- a/clusters/cl01tl/manifests/komodo/Deployment-komodo-ferretdb-2.yaml
+++ b/clusters/cl01tl/manifests/komodo/Deployment-komodo-ferretdb-2.yaml
@@ -39,7 +39,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: uri
-                  name: komodo-postgresql-17-fdb-cluster-superuser
+                  name: komodo-postgresql-17-fdb-cluster-ferret
           image: ghcr.io/ferretdb/ferretdb:2.7.0
           imagePullPolicy: IfNotPresent
           name: main
diff --git a/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml b/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml
index 79a0637b4..8a8be3824 100644
--- a/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml
+++ b/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml
@@ -76,10 +76,7 @@ spec:
             - name: PERIPHERY_SSL_ENABLED
               value: "false"
             - name: DB_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  key: user
-                  name: komodo-postgresql-17-fdb-cluster-app
+              value: ferret
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
diff --git a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-ferret.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-ferret.yaml
new file mode 100644
index 000000000..a799b08b4
--- /dev/null
+++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-postgresql-17-fdb-cluster-ferret.yaml
@@ -0,0 +1,21 @@
+apiVersion: external-secrets.io/v1
+kind: ExternalSecret
+metadata:
+  name: komodo-postgresql-17-fdb-cluster-ferret
+  namespace: komodo
+  labels:
+    app.kubernetes.io/name: komodo-postgresql-17-fdb-cluster-ferret
+    app.kubernetes.io/instance: komodo
+    app.kubernetes.io/part-of: komodo
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: uri
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cl01tl/komodo/config
+        metadataPolicy: None
+        property: uri