diff --git a/helm-msa/templates/deployment/myaktion-deployment.yaml b/helm-msa/templates/deployment/myaktion-deployment.yaml
index 6d1bf3b9fb9f5a07a1c5adc851cbac0c0e486549..420aac91302a3c55977d85bcdfe9c4c256f07239 100644
--- a/helm-msa/templates/deployment/myaktion-deployment.yaml
+++ b/helm-msa/templates/deployment/myaktion-deployment.yaml
@@ -22,7 +22,7 @@ spec:
         - containerPort: 8080
         env:
         - name: SPRING_DATASOURCE_URL
-          value: "jdbc:postgresql://myaktion-postgres-db-service/postgres"
+          value: "jdbc:postgresql://myaktion-db-service/postgres"
         - name: URL_MYAKTION_MONITOR
           value: "http://myaktion-monitor-service/donations"
         - name: SPRING_REDIS_HOST
@@ -30,10 +30,10 @@ spec:
         - name: SPRING_DATASOURCE_USERNAME
           valueFrom:
             secretKeyRef:
-              name: user-db-secret
+              name: myaktion-db-secret
               key: DATABASE_USER
         - name: SPRING_DATASOURCE_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: user-db-secret
+              name: myaktion-db-secret
               key: DATABASE_PASSWORD
diff --git a/helm-msa/templates/service/myaktion-postgres-db-service.yaml b/helm-msa/templates/service/myaktion-db-service.yaml
similarity index 65%
rename from helm-msa/templates/service/myaktion-postgres-db-service.yaml
rename to helm-msa/templates/service/myaktion-db-service.yaml
index 8ee5c56f77814140fb210446aa86ff5cec622c1e..d9ca1e696be7d5574ecd7229ccc7a0c0a4222f0d 100644
--- a/helm-msa/templates/service/myaktion-postgres-db-service.yaml
+++ b/helm-msa/templates/service/myaktion-db-service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: myaktion-postgres-db-service
+  name: myaktion-db-service
 spec:
   selector:
-    app: myaktion-postgres-db
+    app: myaktion-db
   ports:
     - protocol: TCP
       port: 5432