diff --git a/docs/user.md b/docs/user.md
index ef3277436..3980f9900 100644
--- a/docs/user.md
+++ b/docs/user.md
@@ -88,7 +88,7 @@ which was generated when creating the `acid-minimal-cluster`. As non-encrypted
 connections are rejected by default set the SSL mode to `require`:
 
 ```bash
-export PGPASSWORD=$(kubectl get secret postgres.acid-minimal-cluster.credentials -o 'jsonpath={.data.password}' | base64 -d)
+export PGPASSWORD=$(kubectl get secret postgres.acid-minimal-cluster.credentials.postgresql.acid.zalan.do -o 'jsonpath={.data.password}' | base64 -d)
 export PGSSLMODE=require
 psql -U postgres -h localhost -p 6432
 ```
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 70719524b..abc4df299 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -114,7 +114,7 @@ data:
   resync_period: 30m
   ring_log_lines: "100"
   role_deletion_suffix: "_deleted"
-  secret_name_template: "{username}.{cluster}.credentials"
+  secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
   # sidecar_docker_images: ""
   # set_memory_request_to_limit: "false"
   spilo_allow_privilege_escalation: "true"