diff --git a/nodes/heimdall/core/compose.yaml b/nodes/heimdall/core/compose.yaml
index b89ccfa..82a3612 100644
--- a/nodes/heimdall/core/compose.yaml
+++ b/nodes/heimdall/core/compose.yaml
@@ -133,7 +133,7 @@ services:
 
   # --- MANAGEMENT ---
   komodo-db:
-    image: mongo:8.2.6
+    image: mongo:7.0
     container_name: komodo-db
     labels:
       komodo.skip: # Prevent Komodo from stopping with StopAllContainers
@@ -149,6 +149,12 @@ services:
     environment:
       MONGO_INITDB_ROOT_USERNAME: ${KOMODO_DATABASE_USERNAME}
       MONGO_INITDB_ROOT_PASSWORD: ${KOMODO_DATABASE_PASSWORD}
+    healthcheck:
+      test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand({ ping: 1 })"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
 
   komodo-core:
     image: ghcr.io/moghtech/komodo-core:2
@@ -156,7 +162,8 @@ services:
     container_name: komodo-core
     restart: unless-stopped
     depends_on:
-      - komodo-db
+      komodo-db:
+        condition: service_healthy
     networks:
       - proxy-net
     ports: