diff --git a/compose/2.4.6/docker-compose.yml b/compose/2.4.6/docker-compose.yml
index eb5df97..a5706ea 100644
--- a/compose/2.4.6/docker-compose.yml
+++ b/compose/2.4.6/docker-compose.yml
@@ -92,6 +92,14 @@ services:
       - magento
     command: redis-server --appendonly yes
 
+  mailpit:
+    image: axllent/mailpit:v1.29.0
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+    networks:
+      - magento
+
 volumes:
   db_data:
   opensearch_data:
diff --git a/compose/2.4.7/docker-compose.yml b/compose/2.4.7/docker-compose.yml
index 5275ec5..809ee88 100644
--- a/compose/2.4.7/docker-compose.yml
+++ b/compose/2.4.7/docker-compose.yml
@@ -92,6 +92,14 @@ services:
       - magento
     command: redis-server --appendonly yes
 
+  mailpit:
+    image: axllent/mailpit:v1.29.0
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+    networks:
+      - magento
+
 volumes:
   db_data:
   opensearch_data:
diff --git a/compose/2.4.8/docker-compose.yml b/compose/2.4.8/docker-compose.yml
index 2f83eaf..9913144 100644
--- a/compose/2.4.8/docker-compose.yml
+++ b/compose/2.4.8/docker-compose.yml
@@ -92,6 +92,14 @@ services:
       - magento
     command: valkey-server --appendonly yes
 
+  mailpit:
+    image: axllent/mailpit:v1.29.0
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+    networks:
+      - magento
+
 volumes:
   db_data:
   opensearch_data:
diff --git a/compose/2.4.9/docker-compose.yml b/compose/2.4.9/docker-compose.yml
index 9369dfe..3fa2964 100644
--- a/compose/2.4.9/docker-compose.yml
+++ b/compose/2.4.9/docker-compose.yml
@@ -92,6 +92,14 @@ services:
       - magento
     command: valkey-server --appendonly yes
 
+  mailpit:
+    image: axllent/mailpit:v1.29.0
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+    networks:
+      - magento
+
 volumes:
   db_data:
   opensearch_data:
diff --git a/devcontainer.json.sample b/devcontainer.json.sample
index a87dea4..4234cab 100644
--- a/devcontainer.json.sample
+++ b/devcontainer.json.sample
@@ -10,6 +10,7 @@
   "service": "php",
   "forwardPorts": [
     "nginx:8000",
+    "mailpit:8025",
     3306,
     9200,
     5672,
@@ -31,6 +32,9 @@
     },
     "6379": {
       "label": "Redis/Valkey"
+    },
+    "mailpit:8025": {
+      "label": "Mailpit"
     }
   },
   "customizations": {