diff --git a/devel/docker-compose.yaml b/devel/docker-compose.yaml
index 02e7d5a..60c5559 100644
--- a/devel/docker-compose.yaml
+++ b/devel/docker-compose.yaml
@@ -1,12 +1,17 @@
-version: '3.1'
-
+---
 services:
   mongo:
     build: mongo
     ports:
       - "127.0.0.1:27017:27017"
-    command: ["--replSet", "rs", "--logappend", "--logpath", "/dev/null"]
+    command: ["--replSet", "rs"]
     hostname: "mongo"
+    restart: always
+    healthcheck:
+      test: ["CMD", "mongo", "test"]
+      interval: 5s
+      timeout: 2s
+      retries: 5
 
   perflab_web:
     build:
@@ -20,8 +25,6 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
-    links:
-      - mongo
     init: true
 
   perflab_agent:
@@ -35,8 +38,6 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
-    links:
-      - mongo
     init: true
 
   mongoexpress:
@@ -46,7 +47,5 @@ services:
     depends_on:
       mongo:
         condition: service_healthy
-    links:
-      - mongo
     environment:
-      ME_CONFIG_MONGODB_SERVER: "mongo"
+      - ME_CONFIG_MONGODB_URL=mongodb://mongo:27017
diff --git a/devel/mongo/Dockerfile b/devel/mongo/Dockerfile
index 1522dcd..6b26792 100644
--- a/devel/mongo/Dockerfile
+++ b/devel/mongo/Dockerfile
@@ -1,5 +1,3 @@
-FROM mongo
+FROM docker.io/library/mongo:4
 
 ADD init.js /docker-entrypoint-initdb.d/
-
-HEALTHCHECK --interval=5s --start-period=10s CMD mongo test