diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 3501724..7d59dd6 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,15 +1,15 @@
 spring:
   datasource:
-    url: ${DB_URL:?DB_URL is required}
-    username: ${DB_USERNAME:?DB_USERNAME is required}
-    password: ${DB_PASSWORD:?DB_PASSWORD is required}
+    url: ${SPRING_DATASOURCE_URL:?DB_URL is required}
+    username: ${SPRING_DATASOURCE_USERNAME:?DB_USERNAME is required}
+    password: ${SPRING_DATASOURCE_PASSWORD:?DB_PASSWORD is required}
     driver-class-name: org.postgresql.Driver
 
   mail:
-    host: ${MAIL_HOST:}
-    port: ${MAIL_PORT:}
-    username: ${MAIL_USERNAME:}
-    password: ${MAIL_PASSWORD:}
+    host: ${MAIL_HOST}
+    port: ${MAIL_PORT}
+    username: ${MAIL_USERNAME}
+    password: ${MAIL_PASSWORD}
     properties:
       mail:
         smtp:
@@ -19,7 +19,7 @@ spring:
 
   data:
     redis:
-      host: redis
+      host: vimaltech-redis
       port: 6379
       password: ${SPRING_DATA_REDIS_PASSWORD}
       timeout: 2000
@@ -57,6 +57,15 @@ management:
   endpoint:
     health:
       show-details: never
+      probes:
+        enabled: true   # ✅ IMPORTANT
+      group:
+        readiness:
+          include: db,redis
+
+  health:
+    mail:
+      enabled: false   # ✅ CRITICAL FIX
 
   metrics:
     tags: