diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 9b2c0b6..cb15c36 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1,7 +1,7 @@
 api.baseUrl=https://cftunnels.hithomelabs.com
 
 # Production Database Configuration
-spring.datasource.url=${DB_URL}
+spring.datasource.url=jdbc:postgresql://postgres:5432/cftunnel
 spring.datasource.username=${POSTGRES_USERNAME}
 spring.datasource.password=${POSTGRES_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index bb6d864..b257503 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -1,7 +1,7 @@
 api.baseUrl=https://testcf.hithomelabs.com
 
 # Test Database Configuration - Same as Production
-spring.datasource.url=${DB_URL}
+spring.datasource.url=jdbc:postgresql://postgres:5432/cftunnel
 spring.datasource.username=${POSTGRES_USERNAME}
 spring.datasource.password=${POSTGRES_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver