diff --git a/investigation-service/src/main/resources/application.yaml b/investigation-service/src/main/resources/application.yaml
index 06496cbd..c72b9593 100644
--- a/investigation-service/src/main/resources/application.yaml
+++ b/investigation-service/src/main/resources/application.yaml
@@ -33,11 +33,11 @@ spring:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
     driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:NBS_ODSE};encrypt=true;trustServerCertificate=true;
+    url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
     odse:
-      url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:NBS_ODSE};encrypt=true;trustServerCertificate=true;
+      url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
     rdb:
-      url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_RDB:RDB};encrypt=true;trustServerCertificate=true;
+      url: ${DB_RDB_URL:jdbc:sqlserver://localhost:1433;databaseName=:RDB;encrypt=true;trustServerCertificate=true;}
   liquibase:
     change-log: db/changelog/db.changelog-master.yaml
 service:
diff --git a/ldfdata-service/src/main/resources/application.yaml b/ldfdata-service/src/main/resources/application.yaml
index 629b5685..abbdfabe 100644
--- a/ldfdata-service/src/main/resources/application.yaml
+++ b/ldfdata-service/src/main/resources/application.yaml
@@ -20,7 +20,7 @@ spring:
   datasource:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:NBS_ODSE};encrypt=true;trustServerCertificate=true;
+    url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
   liquibase:
     change-log: db/changelog/db.changelog-master.yaml
 server:
diff --git a/observation-service/src/main/resources/application.yaml b/observation-service/src/main/resources/application.yaml
index 9df7f453..bda50927 100644
--- a/observation-service/src/main/resources/application.yaml
+++ b/observation-service/src/main/resources/application.yaml
@@ -28,7 +28,7 @@ spring:
   datasource:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:NBS_ODSE};encrypt=true;trustServerCertificate=true;
+    url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
   liquibase:
     change-log: db/changelog/db.changelog-master.yaml
 server:
diff --git a/organization-service/src/main/resources/application.yaml b/organization-service/src/main/resources/application.yaml
index 8a2f8843..1d31defd 100644
--- a/organization-service/src/main/resources/application.yaml
+++ b/organization-service/src/main/resources/application.yaml
@@ -32,7 +32,7 @@ spring:
   datasource:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:nbs_odse};encrypt=true;trustServerCertificate=true;
+    url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
   liquibase:
     change-log: db/changelog/db.changelog-master.yaml
 server:
diff --git a/person-service/src/main/resources/application.yaml b/person-service/src/main/resources/application.yaml
index b2e9f4b4..1a9b2be6 100644
--- a/person-service/src/main/resources/application.yaml
+++ b/person-service/src/main/resources/application.yaml
@@ -34,7 +34,7 @@ spring:
   datasource:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_ODSE:nbs_odse};encrypt=true;trustServerCertificate=true;
+    url: ${DB_ODSE_URL:jdbc:sqlserver://localhost:1433;databaseName=:NBS_ODSE;encrypt=true;trustServerCertificate=true;}
   liquibase:
     change-log: db/changelog/db.changelog-master.yaml
 server:
diff --git a/post-processing-service/src/main/resources/application.yaml b/post-processing-service/src/main/resources/application.yaml
index 202e150b..3dba28d7 100644
--- a/post-processing-service/src/main/resources/application.yaml
+++ b/post-processing-service/src/main/resources/application.yaml
@@ -28,7 +28,7 @@ spring:
   datasource:
     password: ${DB_PASSWORD:-fake.fake.fake.1234}
     username: ${DB_USERNAME:-sa}
-    url: jdbc:sqlserver://${DB_URL:localhost}:1433;databaseName=${DB_RDB:RDB};encrypt=true;trustServerCertificate=true;
+    url: ${DB_RDB_URL:jdbc:sqlserver://localhost:1433;databaseName=:RDB;encrypt=true;trustServerCertificate=true;}
   jpa:
     properties:
       javax.persistence.query.timeout: -1