diff --git a/server/devel/docker-compose.override.yml b/server/devel/docker-compose.override.yml
index 727c94f0..8cb93676 100644
--- a/server/devel/docker-compose.override.yml
+++ b/server/devel/docker-compose.override.yml
@@ -1,10 +1,8 @@
 services:
   mongo:
     environment:
-      - MONGODB_USERNAME=testflinger
-      - MONGODB_PASSWORD=testflinger
-      - MONGODB_DATABASE=testflinger_db
-      - MONGODB_ROOT_PASSWORD=testflinger
+      - MONGO_INITDB_ROOT_USERNAME=testflinger
+      - MONGO_INITDB_ROOT_PASSWORD=testflinger
 
   testflinger:
     command: gunicorn --bind 0.0.0.0:5000 --reload testflinger:app
@@ -13,7 +11,7 @@ services:
       - MONGODB_PASSWORD=testflinger
       - MONGODB_DATABASE=testflinger_db
       - MONGODB_HOST=mongo
-      - MONGODB_AUTH_SOURCE=testflinger_db
+      - MONGODB_AUTH_SOURCE=admin
     volumes:
       - .:/srv/testflinger
 
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index 495dd389..3459002e 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   mongo:
-    image: bitnami/mongodb:latest
+    image: mongo:5
     env_file:
       - testflinger.env
     ports: