diff --git a/templates/api-deployment.yml b/templates/api-deployment.yml
index 5c376a3a884e086656119bdf95d797f54d1c7f9f..45e244a6eaecc12f93f5fbebe0f1d522ad5d4ae8 100644
--- a/templates/api-deployment.yml
+++ b/templates/api-deployment.yml
@@ -33,12 +33,12 @@ spec:
             - name: POSTGRES_USER
               valueFrom:
                 secretKeyRef:
-                  name: db-secret
+                  name: {{include "name" .}}-db-secret
                   key: user
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: db-secret
+                  name: {{include "name" .}}-db-secret
                   key: password
             - name: DB_ENDPOINT
               valueFrom:
diff --git a/templates/pg-credentials.yml b/templates/pg-credentials.yml
index 642c1b0b72079ebdcaf33743f16362cc98c77d24..a5a34baa4e4da6d679fc1b6d53035a107db0dfe8 100644
--- a/templates/pg-credentials.yml
+++ b/templates/pg-credentials.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: db-secret
+  name: {{include "name" .}}-db-secret
 type: Opaque
 data:
   user: ZGItdXNlcg==
diff --git a/templates/pg-statefulSet.yml b/templates/pg-statefulSet.yml
index 6ea2234715985ab0c4816a1402d5721d424a2dbd..4370288c5bec9dd0f40e33cca43ccfb7e5f60ad4 100644
--- a/templates/pg-statefulSet.yml
+++ b/templates/pg-statefulSet.yml
@@ -36,12 +36,12 @@ spec:
             - name: POSTGRES_USER
               valueFrom:
                 secretKeyRef:
-                  name: db-secret
+                  name: {{include "name" .}}-db-secret
                   key: user
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: db-secret
+                  name: {{include "name" .}}-db-secret
                   key: password
             - name: PGDATA
               valueFrom: