diff --git a/README.md b/README.md
index f3e1329..ee3dec8 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Although this project started as a development environment for Totara Learn it c
  * Microsoft SQL Server ([2017](https://www.microsoft.com/en-us/sql-server/sql-server-2017), [2019](https://www.microsoft.com/en-us/sql-server/sql-server-2019), [2022](https://www.microsoft.com/en-us/sql-server/sql-server-2022))
  * [NodeJS](https://nodejs.org/) for building, developing and testing frontend code
  * A [PHPUnit](https://phpunit.de/) and [Behat](http://behat.org/en/latest/) setup to run tests (including [Selenium](https://www.seleniumhq.org/))
- * A [mailcatcher](https://mailcatcher.me/) instance to view sent emails
+ * A [MailDev](https://github.com/maildev/maildev?tab=readme-ov-file#maildev) instance to view sent emails
  * [Redis](https://redis.io/) for caching and/or session handling
  * [XHProf](https://github.com/tideways/php-xhprof-extension) for profiling
  * [XDebug](https://xdebug.org/) installed, ready for debugging with your favorite IDE
diff --git a/compose/apache.yml b/compose/apache.yml
index 9d65d62..c015af2 100644
--- a/compose/apache.yml
+++ b/compose/apache.yml
@@ -15,7 +15,7 @@ services:
       - ${LOCAL_SRC}:${REMOTE_SRC}
       - totara-data:${REMOTE_DATA}
     depends_on:
-      - mailcatcher
+      - maildev
     networks:
       totara:
         aliases:
diff --git a/compose/nginx.yml b/compose/nginx.yml
index 856f072..b251d41 100644
--- a/compose/nginx.yml
+++ b/compose/nginx.yml
@@ -15,7 +15,7 @@ services:
       - ${LOCAL_SRC}:${REMOTE_SRC}
       - totara-data:${REMOTE_DATA}
     depends_on:
-      - mailcatcher
+      - maildev
     networks:
       totara:
         aliases:
diff --git a/config.php b/config.php
index a26509e..0b31af0 100644
--- a/config.php
+++ b/config.php
@@ -484,7 +484,7 @@
 //////////////////////////////////////////////////////////////////////////
 
 // Redirects any emails sent by the server
-$CFG->smtphosts = 'mailcatcher:25';
+$CFG->smtphosts = 'maildev:1025';
 
 $CFG->passwordpolicy = false;
 $CFG->tool_generator_users_password = '12345';
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b598c4..112a4ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,17 @@ services:
       - totara-data:${REMOTE_DATA}
     working_dir: ${REMOTE_SRC}
 
+  maildev:
+    image: maildev/maildev
+    container_name: totara_maildev
+    ports:
+      - "1080:1080"
+    environment:
+      TZ: ${TIME_ZONE}
+    networks:
+      - totara
+
+  # Deprecated - use maildev instead
   mailcatcher:
     image: tophfr/mailcatcher
     container_name: totara_mailcatcher