diff --git a/templates/api/api-config.yaml b/templates/api/api-config.yaml
index 0497e183aa245f64e009614d0355d4e13f5c5d4e..2c15edc73619e6c1f63bb964094d6baadb546325 100644
--- a/templates/api/api-config.yaml
+++ b/templates/api/api-config.yaml
@@ -3,5 +3,5 @@ kind: ConfigMap
 metadata:  
   name: {{ .Values.name }}-api  
 data:  
-  endpoint: "pg-service:5432"
+  endpoint: "{{ .Values.name}}-pgservice:5432"
   database: {{ .Values.name}}-db
diff --git a/templates/api/api-deployment.yaml b/templates/api/api-deployment.yaml
index 1b851ae3a0da6f1fb0c066f2a938ec818f2fd472..cf61b55a89421e7136c3cb8da2b7078aabf3aba3 100644
--- a/templates/api/api-deployment.yaml
+++ b/templates/api/api-deployment.yaml
@@ -40,12 +40,12 @@ spec:
           - name: POSTGRES_USER
             valueFrom:
               secretKeyRef:
-                name: pg-credentials
+                name: {{ .Values.name}}-credentials
                 key: username
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pg-credentials
+                name: {{ .Values.name}}-credentials
                 key: password 
       imagePullSecrets:
         - name : takima-school-registry
\ No newline at end of file
diff --git a/templates/database/pg-credentials.yaml b/templates/database/pg-credentials.yaml
index 2800e43d5933eee4ce4cdafc05d7cdf9573ca31c..255ef37a906be17b67ccf4adc1ef4874ebe7f7b3 100644
--- a/templates/database/pg-credentials.yaml
+++ b/templates/database/pg-credentials.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: pg-credentials
+  name: {{ .Values.name}}-credentials
 type: Opaque
 data:
   username: YWRtaW4=
diff --git a/templates/database/pg-deployment.yaml b/templates/database/pg-deployment.yaml
index 14abdd39b6326af1ac487e7bc2d70be8845971fc..9b215c247779e68401f53ed75fc0ee07cdbfc4d3 100644
--- a/templates/database/pg-deployment.yaml
+++ b/templates/database/pg-deployment.yaml
@@ -40,12 +40,12 @@ spec:
           - name: POSTGRES_USER
             valueFrom:
               secretKeyRef:
-                name: pg-credentials
+                name: {{ .Values.name}}-credentials
                 key: username
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pg-credentials
+                name: {{ .Values.name}}-credentials
                 key: password
       imagePullSecrets:
         - name : takima-school-registry
\ No newline at end of file
diff --git a/templates/database/pg-service.yaml b/templates/database/pg-service.yaml
index e3d1abb559d759252b0702f2d7c8dc4fbb91e710..8718dc0f332063211440336a5a9ad798ad8a4814 100644
--- a/templates/database/pg-service.yaml
+++ b/templates/database/pg-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: pg-service
+  name: {{ .Values.name}}-pgservice
 spec:
   selector:
     app: pg