diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml
index f0b193b2d..8f897fa64 100755
--- a/docker/dev/docker-compose.yaml
+++ b/docker/dev/docker-compose.yaml
@@ -35,13 +35,13 @@ services:
   mongodb:
     image: uptime_mongo:latest
     restart: always
-    command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     volumes:
       - ./mongo/data:/data/db
     healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
       interval: 5s
       timeout: 30s
       start_period: 0s
       start_interval: 1s
-      retries: 30
\ No newline at end of file
+      retries: 30
diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index 921d3b8c1..37a5f4636 100644
--- a/docker/dist-arm/docker-compose.yaml
+++ b/docker/dist-arm/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
     environment:
       - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
       - UPTIME_APP_CLIENT_HOST=http://localhost
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - REDIS_URL=redis://redis:6379
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
@@ -22,22 +22,10 @@ services:
       - "27017:27017"
     volumes:
       - ./mongo/data:/data/db
-
-  mongo-init:
-    image: mongo:4.4.18
-    depends_on:
-      - mongodb
-    entrypoint: >
-      bash -c "
-        echo 'Waiting for MongoDB to be ready...' &&
-        until mongo --host mongodb --eval 'db.adminCommand(\"ping\")' > /dev/null 2>&1; do
-          sleep 2
-        done &&
-        echo 'MongoDB is up. Initiating replica set...' &&
-        mongo --host mongodb --eval '
-          rs.initiate({
-            _id: \"rs0\",
-            members: [{ _id: 0, host: \"mongodb:27017\" }]
-          })
-        ' || echo 'Replica set may already be initialized.'
-      "
+    healthcheck:
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml
index 0dd97aafb..342e59c96 100755
--- a/docker/dist-mono/docker-compose.yaml
+++ b/docker/dist-mono/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
     environment:
       - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
       - UPTIME_APP_CLIENT_HOST=http://localhost
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - REDIS_URL=redis://redis:6379
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
@@ -16,11 +16,11 @@ services:
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate-mongo:latest
     restart: always
-    command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     volumes:
       - ./mongo/data:/data/db
     healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
       interval: 5s
       timeout: 30s
       start_period: 0s
diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml
index ff2f1b7ea..980c727f6 100755
--- a/docker/dist/docker-compose.yaml
+++ b/docker/dist/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
     depends_on:
       - mongodb
     environment:
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - REDIS_URL=redis://redis:6379
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
@@ -29,9 +29,9 @@ services:
     restart: always
     volumes:
       - ./mongo/data:/data/db
-    command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongodb:27017'}]}) }" | mongosh --port 27017 --quiet
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
       interval: 5s
       timeout: 30s
       start_period: 0s