diff --git a/src/Resources/docker-templates/drupal/docker-compose.yml b/src/Resources/docker-templates/drupal/docker-compose.yml
index 3162971..d5629f6 100644
--- a/src/Resources/docker-templates/drupal/docker-compose.yml
+++ b/src/Resources/docker-templates/drupal/docker-compose.yml
@@ -20,12 +20,13 @@ services:
 # <== DATABASE PLACEHOLDER ==>
 
   maildev:
-    image: djfarrelly/maildev:latest
-    platform: linux/amd64
+    image: maildev/maildev
+    environment:
+      MAILDEV_SMTP_PORT: 25
     depends_on:
       - php
     ports:
-      - "1080:80"
+      - "1080:1080"
 
   nginx:
     image: ajardin/nginx:latest
diff --git a/src/Resources/docker-templates/magento2/docker-compose.yml b/src/Resources/docker-templates/magento2/docker-compose.yml
index e120714..3dff70e 100644
--- a/src/Resources/docker-templates/magento2/docker-compose.yml
+++ b/src/Resources/docker-templates/magento2/docker-compose.yml
@@ -28,12 +28,13 @@ services:
 # <== DATABASE PLACEHOLDER ==>
 
   maildev:
-    image: djfarrelly/maildev:latest
-    platform: linux/amd64
+    image: maildev/maildev
+    environment:
+      MAILDEV_SMTP_PORT: 25
     depends_on:
       - php
     ports:
-      - "1080:80"
+      - "1080:1080"
 
   nginx:
     image: ajardin/magento2-nginx:latest
diff --git a/src/Resources/docker-templates/orocommerce/docker-compose.yml b/src/Resources/docker-templates/orocommerce/docker-compose.yml
index 5e5c71c..bc29954 100644
--- a/src/Resources/docker-templates/orocommerce/docker-compose.yml
+++ b/src/Resources/docker-templates/orocommerce/docker-compose.yml
@@ -28,12 +28,13 @@ services:
       - elasticsearch:/usr/share/elasticsearch/data
 
   maildev:
-    image: djfarrelly/maildev:latest
-    platform: linux/amd64
+    image: maildev/maildev
+    environment:
+      MAILDEV_SMTP_PORT: 25
     depends_on:
       - php
     ports:
-      - "1080:80"
+      - "1080:1080"
 
   nginx:
     image: ajardin/nginx:latest
diff --git a/src/Resources/docker-templates/sylius/docker-compose.yml b/src/Resources/docker-templates/sylius/docker-compose.yml
index 3162971..d5629f6 100644
--- a/src/Resources/docker-templates/sylius/docker-compose.yml
+++ b/src/Resources/docker-templates/sylius/docker-compose.yml
@@ -20,12 +20,13 @@ services:
 # <== DATABASE PLACEHOLDER ==>
 
   maildev:
-    image: djfarrelly/maildev:latest
-    platform: linux/amd64
+    image: maildev/maildev
+    environment:
+      MAILDEV_SMTP_PORT: 25
     depends_on:
       - php
     ports:
-      - "1080:80"
+      - "1080:1080"
 
   nginx:
     image: ajardin/nginx:latest
diff --git a/src/Resources/docker-templates/symfony/docker-compose.yml b/src/Resources/docker-templates/symfony/docker-compose.yml
index 3162971..d5629f6 100644
--- a/src/Resources/docker-templates/symfony/docker-compose.yml
+++ b/src/Resources/docker-templates/symfony/docker-compose.yml
@@ -20,12 +20,13 @@ services:
 # <== DATABASE PLACEHOLDER ==>
 
   maildev:
-    image: djfarrelly/maildev:latest
-    platform: linux/amd64
+    image: maildev/maildev
+    environment:
+      MAILDEV_SMTP_PORT: 25
     depends_on:
       - php
     ports:
-      - "1080:80"
+      - "1080:1080"
 
   nginx:
     image: ajardin/nginx:latest