diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml
index 7c43f76982fb26407ec1d4acd9af08bc791bdd85..65d2d5983a1735b4b7e4e4ed56494e38c8c622ec 100644
--- a/templates/api-deployment.yaml
+++ b/templates/api-deployment.yaml
@@ -60,21 +60,21 @@ spec:
           - name: DB_ENDPOINT
             valueFrom:
               configMapKeyRef:
-                name: api-config
+                name: {{.Values.name }}-api
                 key: DB_ENDPOINT
           - name: POSTGRES_DB
             valueFrom:
               configMapKeyRef:
-                name: api-config
+                name: {{.Values.name }}-api
                 key: DB_NAME
           - name: POSTGRES_USER
             valueFrom:
               secretKeyRef:
-                name: pg-credentials  # Nom du secret
+                name: {{ .Values.name }}-db  # Nom du secret
                 key: pg_username     # nom de la clef dans le config map
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pg-credentials  # Nom du secret
+                name: {{ .Values.name }}-db  # Nom du secret
                 key: pg_password 
 {{- end }}
\ No newline at end of file
diff --git a/templates/pg-deployment.yaml b/templates/pg-deployment.yaml
index 4e5777ac7989a78acd315ffc62905d57e6a1e3c1..e7564bc78ee1f0202359e9ec4559ed6afa76f9fc 100644
--- a/templates/pg-deployment.yaml
+++ b/templates/pg-deployment.yaml
@@ -24,22 +24,22 @@ spec:
           - name: POSTGRES_DB
             valueFrom:
               configMapKeyRef:
-                name: pg-config  # Nom du configmap
+                name: {{ .Values.name }}-db  # Nom du configmap
                 key: db_name     # nom de la clef dans le config map contenant le nom de la DB
           - name: PGDATA
             valueFrom:
               configMapKeyRef:
-                name: pg-config  # Nom du configmap
+                name: {{ .Values.name }}-db # Nom du configmap
                 key: db_path     # nom de la clef dans le configMap contenant path ou installer la db dans le volume persistant
           - name: POSTGRES_USER
             valueFrom:
               secretKeyRef:
-                name: pg-credentials  # Nom du secret
+                name: {{ .Values.name }}-db  # Nom du secret
                 key: pg_username     # nom de la clef dans le secret
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pg-credentials  # Nom du secret
+                name: {{ .Values.name }}-db  # Nom du secret
                 key: pg_password     # nom de la clef dans le secret contenant le password
       imagePullSecrets:
       - name: takima-school-registry