diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml
index f0b193b2d..a2c66c027 100755
--- a/docker/dev/docker-compose.yaml
+++ b/docker/dev/docker-compose.yaml
@@ -19,29 +19,17 @@ services:
     env_file:
       - server.env
     depends_on:
-      - redis
       - mongodb
-  redis:
-    image: uptime_redis:latest
-    restart: always
-    volumes:
-      - ./redis/data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
   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/dev/redis.Dockerfile b/docker/dev/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/dev/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index 921d3b8c1..96bbf8f3f 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", "mongo", "--eval", "db.runCommand({ ping: 1 })", "--quiet"]
+      interval: 5s
+      timeout: 30s
+      start_period: 0s
+      start_interval: 1s
+      retries: 30
diff --git a/docker/dist-mono/build_images.sh b/docker/dist-mono/build_images.sh
index b56b9052c..fd3a163cc 100755
--- a/docker/dist-mono/build_images.sh
+++ b/docker/dist-mono/build_images.sh
@@ -8,7 +8,6 @@ cd ../..
 services=("mono_mongo" "mono_redis" "mono_server")
 dockerfiles=(
   "./docker/dist-mono/mongoDB.Dockerfile"
-  "./docker/dist-mono/redis.Dockerfile"
   "./docker/dist-mono/server.Dockerfile"
 )
 
diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml
index 0dd97aafb..0e0b49445 100755
--- a/docker/dist-mono/docker-compose.yaml
+++ b/docker/dist-mono/docker-compose.yaml
@@ -7,8 +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
-      - REDIS_URL=redis://redis:6379
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
     depends_on:
@@ -16,11 +15,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-mono/redis.Dockerfile b/docker/dist-mono/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/dist-mono/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/dist/build_images.sh b/docker/dist/build_images.sh
index 953682175..84fbb7d5a 100755
--- a/docker/dist/build_images.sh
+++ b/docker/dist/build_images.sh
@@ -7,7 +7,6 @@ cd ../../
 declare -A services=(
   ["bluewaveuptime/uptime_client"]="./docker/dist/client.Dockerfile"
   ["bluewaveuptime/uptime_database_mongo"]="./docker/dist/mongoDB.Dockerfile"
-  ["bluewaveuptime/uptime_redis"]="./docker/dist/redis.Dockerfile"
   ["bluewaveuptime/uptime_server"]="./docker/dist/server.Dockerfile"
 )
 
diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml
index ff2f1b7ea..2e845daab 100755
--- a/docker/dist/docker-compose.yaml
+++ b/docker/dist/docker-compose.yaml
@@ -18,8 +18,7 @@ services:
     depends_on:
       - mongodb
     environment:
-      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0
-      - REDIS_URL=redis://redis:6379
+      - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
     # volumes:
@@ -29,9 +28,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
diff --git a/docker/dist/redis.Dockerfile b/docker/dist/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/dist/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/prod/build_images.sh b/docker/prod/build_images.sh
index 23e91355c..49f8c7841 100755
--- a/docker/prod/build_images.sh
+++ b/docker/prod/build_images.sh
@@ -8,7 +8,6 @@ cd ../../
 declare -A services=(
   ["uptime_client"]="./docker/prod/client.Dockerfile"
   ["uptime_database_mongo"]="./docker/prod/mongoDB.Dockerfile"
-  ["uptime_redis"]="./docker/prod/redis.Dockerfile"
   ["uptime_server"]="./docker/prod/server.Dockerfile"
 )
 
diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml
index 980a0e2f5..61c6c021d 100755
--- a/docker/prod/docker-compose.yaml
+++ b/docker/prod/docker-compose.yaml
@@ -37,14 +37,13 @@ services:
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate:mongo-demo
     restart: always
-    command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     volumes:
       - ./mongo/data:/data/db
-      # - ./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
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
       interval: 5s
       timeout: 30s
       start_period: 0s
diff --git a/docker/prod/redis.Dockerfile b/docker/prod/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/prod/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/staging/build_images.sh b/docker/staging/build_images.sh
index ccfd451ba..a11aebf7c 100755
--- a/docker/staging/build_images.sh
+++ b/docker/staging/build_images.sh
@@ -8,7 +8,6 @@ cd ../../
 declare -A services=(
   ["uptime_client"]="./docker/staging/client.Dockerfile"
   ["uptime_database_mongo"]="./docker/staging/mongoDB.Dockerfile"
-  ["uptime_redis"]="./docker/staging/redis.Dockerfile"
   ["uptime_server"]="./docker/staging/server.Dockerfile"
 )
 
diff --git a/docker/staging/docker-compose.yaml b/docker/staging/docker-compose.yaml
index b9ca52b6e..436c6327f 100755
--- a/docker/staging/docker-compose.yaml
+++ b/docker/staging/docker-compose.yaml
@@ -31,34 +31,19 @@ services:
     env_file:
       - server.env
     depends_on:
-      - redis
       - mongodb
-  redis:
-    image: ghcr.io/bluewave-labs/checkmate:redis-staging
-    restart: always
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis/data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
   mongodb:
     image: ghcr.io/bluewave-labs/checkmate:mongo-staging
     restart: always
-    command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     ports:
       - "27017:27017"
     volumes:
       - ./mongo/data:/data/db
-      # - ./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
+      test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')", "--quiet"]
       interval: 5s
       timeout: 30s
       start_period: 0s
diff --git a/docker/staging/redis.Dockerfile b/docker/staging/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/staging/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file