diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml
index d5465d170..dc07320e4 100755
--- a/docker/prod/docker-compose.yaml
+++ b/docker/prod/docker-compose.yaml
@@ -52,6 +52,13 @@ services:
       - "27017:27017"
     volumes:
       - ./mongo/data:/data/db
-      - ./mongo/init/init.js:/docker-entrypoint-initdb.d/init.js
+      # - ./mongo/init/init.js:/docker-entrypoint-initdb.d/init.js // No longer needed
     env_file:
       - mongo.env
+    healthcheck:
+      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
diff --git a/docker/prod/mongo/init/init.js b/docker/prod/mongo/init/init.js
index f3811e893..34b90ced3 100644
--- a/docker/prod/mongo/init/init.js
+++ b/docker/prod/mongo/init/init.js
@@ -2,7 +2,7 @@ function initiateReplicaSet() {
   try {
     rs.initiate({
       _id: "rs0",
-      members: [{ _id: 0, host: "mongodb:27017" }],
+      members: [{ _id: 0, host: "localhost:27017" }],
     });
   } catch (e) {
     print("Replica set already initiated or error occurred: " + e);
diff --git a/docker/staging/docker-compose.yaml b/docker/staging/docker-compose.yaml
index 128dc1a55..8117dc01b 100755
--- a/docker/staging/docker-compose.yaml
+++ b/docker/staging/docker-compose.yaml
@@ -54,7 +54,13 @@ services:
       - "27017:27017"
     volumes:
       - ./mongo/data:/data/db
-      - ./mongo/init/create_users.js:/docker-entrypoint-initdb.d/create_users.js
-      - ./mongo/init/init_replica_set.js:/docker-entrypoint-initdb.d/init_replica_set.js
+      # - ./mongo/init/02_create_users.js:/docker-entrypoint-initdb.d/02_create_users.js // No longer needed
     env_file:
       - mongo.env
+    healthcheck:
+      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30