diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e3a65d9..ebc1231 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -45,7 +45,7 @@ services:
     restart: unless-stopped
 
   mongodb:
-    image: mongo:latest
+    image: mongo:8.0
     container_name: mongodb
     ports:
       - "27017:27017"
diff --git a/recipai-chart/templates/mongodb-deployment.yml b/recipai-chart/templates/mongodb-deployment.yml
index edf7209..bd2430a 100644
--- a/recipai-chart/templates/mongodb-deployment.yml
+++ b/recipai-chart/templates/mongodb-deployment.yml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: mongodb
-          image: mongo:6.0
+          image: mongo:8.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 27017
@@ -28,9 +28,11 @@ spec:
               memory: "512Mi"
               cpu: "500m"
           env:
-            - name: MONGO_INITDB_ROOT_USERNAME
+            - name: MONGO_HOST
+            - value: {{ .Values.services.mongodb }}:27017
+            - name: MONGO_USERNAME
               value: {{ .Values.db.adminUsername }}
-            - name: MONGO_INITDB_ROOT_PASSWORD
+            - name: MONGO_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: mongodb-secret
diff --git a/server/src/main/resources/application.yaml b/server/src/main/resources/application.yaml
index 393a955..91b0b53 100644
--- a/server/src/main/resources/application.yaml
+++ b/server/src/main/resources/application.yaml
@@ -16,7 +16,6 @@ spring:
             uri: http://genai-service:8000 
             predicates:
               - Path=/genai/**
-
   data:
     mongodb:
-      uri: ${MONGODB_URI:mongodb://admin:admin@127.0.0.1:27017/recipai?authSource=admin}
\ No newline at end of file
+      uri: mongodb://${MONGO_USERNAME:admin}:${MONGO_PASSWORD:admin}@${MONGO_HOST:127.0.0.1:27017}/recipai?authSource=admin
\ No newline at end of file