diff --git a/src/main/java/com/hithomelabs/CFTunnels/Controllers/HomeController.java b/src/main/java/com/hithomelabs/CFTunnels/Controllers/HomeController.java
deleted file mode 100644
index 87bffcf..0000000
--- a/src/main/java/com/hithomelabs/CFTunnels/Controllers/HomeController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hithomelabs.CFTunnels.Controllers;
-
-
-import org.springframework.boot.web.servlet.error.ErrorController;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class HomeController implements ErrorController {
-
-    private static final String ERROR_PATH = "/error";
-
-    
-
-}
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index dec0f4b..9b2c0b6 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1 +1,12 @@
-api.baseUrl=https://cftunnels.hithomelabs.com
\ No newline at end of file
+api.baseUrl=https://cftunnels.hithomelabs.com
+
+# Production Database Configuration
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${POSTGRES_USERNAME}
+spring.datasource.password=${POSTGRES_PASSWORD}
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+# JPA Configuration
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
\ No newline at end of file
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index a0ccff7..bb6d864 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -1,7 +1,12 @@
 api.baseUrl=https://testcf.hithomelabs.com
 
-spring.datasource.url: jdbc:h2:mem:testdb
-spring.datasource.driver-class-name: org.h2.Driver
-spring.datasource.username: sa
-spring.datasource.password:
-spring.datasource.jpa.hibernate.ddl-auto: none
\ No newline at end of file
+# Test Database Configuration - Same as Production
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${POSTGRES_USERNAME}
+spring.datasource.password=${POSTGRES_PASSWORD}
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+# JPA Configuration
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect