diff --git a/config-repo/pcp-ballistics-service.yaml b/config-repo/pcp-ballistics-service.yaml
index 3224306..f08748b 100644
--- a/config-repo/pcp-ballistics-service.yaml
+++ b/config-repo/pcp-ballistics-service.yaml
@@ -49,12 +49,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
-    username: postgres
-    password: password
-#    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
-#    username: postgres
-#    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-complex-mission-service.yaml b/config-repo/pcp-complex-mission-service.yaml
index f69530e..65d94fa 100644
--- a/config-repo/pcp-complex-mission-service.yaml
+++ b/config-repo/pcp-complex-mission-service.yaml
@@ -96,9 +96,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellites
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-dynamic-plan-service.yaml b/config-repo/pcp-dynamic-plan-service.yaml
index 5270aa0..8ac9d78 100644
--- a/config-repo/pcp-dynamic-plan-service.yaml
+++ b/config-repo/pcp-dynamic-plan-service.yaml
@@ -88,9 +88,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_complex_plan
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-mission-planing-service.yaml b/config-repo/pcp-mission-planing-service.yaml
index 0daf469..83cdccd 100644
--- a/config-repo/pcp-mission-planing-service.yaml
+++ b/config-repo/pcp-mission-planing-service.yaml
@@ -121,9 +121,9 @@ spring:
       missing-topics-fatal: false
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_missions
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-satellite-catalog-service.yaml b/config-repo/pcp-satellite-catalog-service.yaml
index b6aa6dd..da9b1f7 100644
--- a/config-repo/pcp-satellite-catalog-service.yaml
+++ b/config-repo/pcp-satellite-catalog-service.yaml
@@ -80,9 +80,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellite_catalog
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-stations-service.yaml b/config-repo/pcp-stations-service.yaml
index 3dbc099..e3184ca 100644
--- a/config-repo/pcp-stations-service.yaml
+++ b/config-repo/pcp-stations-service.yaml
@@ -68,9 +68,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_stations
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/pcp-tgu-service.yaml b/config-repo/pcp-tgu-service.yaml
index e458f74..0773e74 100644
--- a/config-repo/pcp-tgu-service.yaml
+++ b/config-repo/pcp-tgu-service.yaml
@@ -123,9 +123,9 @@ spring:
       on-profile: dev
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: ${DB_URL:jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_tgu}
-    username: ${DB_USERNAME:postgres}
-    password: ${DB_PASSWORD:password}
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/config-repo/slots-service.yaml b/config-repo/slots-service.yaml
index cf2debc..8021e3f 100644
--- a/config-repo/slots-service.yaml
+++ b/config-repo/slots-service.yaml
@@ -108,9 +108,9 @@ spring:
       default-topic: pcp.tle
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_slots
-    username: postgres
-    password: password
+    url: "${SPRING_DATASOURCE_URL}"
+    username: "${SPRING_DATASOURCE_USERNAME}"
+    password: "${SPRING_DATASOURCE_PASSWORD}"
   jpa:
     hibernate:
       ddl-auto: validate
diff --git a/helm/pcp-dynamic-plan-service/values-dev.yaml b/helm/pcp-dynamic-plan-service/values-dev.yaml
index 25656a8..4a750da 100644
--- a/helm/pcp-dynamic-plan-service/values-dev.yaml
+++ b/helm/pcp-dynamic-plan-service/values-dev.yaml
@@ -9,3 +9,19 @@ service:
 ingress:
   enabled: true
   host: pcp-dynamic-plan-service.dev.k8s.264.nstart.cloud
+
+extraEnv:
+  - name: SERVER_PORT
+    value: "8080"
+  - name: SPRING_DATASOURCE_URL
+    value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_complex_plan
+  - name: SPRING_DATASOURCE_USERNAME
+    valueFrom:
+      secretKeyRef:
+        name: pcp-dynamic-plan-db
+        key: SPRING_DATASOURCE_USERNAME
+  - name: SPRING_DATASOURCE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: pcp-dynamic-plan-db
+        key: SPRING_DATASOURCE_PASSWORD
diff --git a/helm/pcp-tgu-service/values-dev.yaml b/helm/pcp-tgu-service/values-dev.yaml
index 7de451a..b45e33d 100644
--- a/helm/pcp-tgu-service/values-dev.yaml
+++ b/helm/pcp-tgu-service/values-dev.yaml
@@ -15,3 +15,15 @@ ingress:
 extraEnv:
   - name: SERVER_PORT
     value: "8080"
+  - name: SPRING_DATASOURCE_URL
+    value: jdbc:postgresql://pcp-postgres.pcp-dev.svc.altum.local:5432/pcp_tgu
+  - name: SPRING_DATASOURCE_USERNAME
+    valueFrom:
+      secretKeyRef:
+        name: pcp-tgu-db
+        key: SPRING_DATASOURCE_USERNAME
+  - name: SPRING_DATASOURCE_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: pcp-tgu-db
+        key: SPRING_DATASOURCE_PASSWORD