diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 53f7e7b4e..e0f91c358 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -39,8 +39,8 @@ services:
       - 7474:7474
 
   mailserver:
-    image: djfarrelly/maildev
+    image: maildev/maildev
     container_name: mailserver
     ports:
-      - 1080:80
-      - 25:25
+      - 1080:1080
+      - 1025:1025
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 119cd20eb..cc7490106 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -37,7 +37,7 @@ services:
     #  - NEO4J_dbms_connector_https_listen__address=0.0.0.0:7473
 
   mailserver:
-    image: djfarrelly/maildev
+    image: maildev/maildev
     ports:
-      - 1080:80
-      - 25:25
+      - 1080:1080
+      - 1025:1025