diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml
index 0c6817f97..52adc52d7 100644
--- a/.devcontainer/docker-compose.mysql.yml
+++ b/.devcontainer/docker-compose.mysql.yml
@@ -25,6 +25,7 @@ services:
       - ..:/var/www/html
       - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
       # - ./jwks.json:/keys/jwks.json:ro
+      - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro
     networks:
       - hashtopolis_dev
   hashtopolis-db-dev:
diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml
index ed985a0d0..e807ef60f 100644
--- a/.devcontainer/docker-compose.postgres.yml
+++ b/.devcontainer/docker-compose.postgres.yml
@@ -25,6 +25,7 @@ services:
       - ..:/var/www/html
       - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
       # - ./jwks.json:/keys/jwks.json:ro
+      - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro
     networks:
       - hashtopolis_dev
   hashtopolis-db-dev:
diff --git a/.github/docker-compose.mysql.yml b/.github/docker-compose.mysql.yml
index f8b016f2f..8bbd5eb7a 100644
--- a/.github/docker-compose.mysql.yml
+++ b/.github/docker-compose.mysql.yml
@@ -21,6 +21,7 @@ services:
       - "8080:80"
     volumes:
       - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
+      - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro
     networks:
       - hashtopolis_dev
   hashtopolis-db-dev:
diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml
index d52312acf..95d56968d 100644
--- a/.github/docker-compose.postgres.yml
+++ b/.github/docker-compose.postgres.yml
@@ -21,6 +21,7 @@ services:
       - "8080:80"
     volumes:
       - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
+      - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro
     networks:
       - hashtopolis_dev
   hashtopolis-db-dev:
diff --git a/ci/php/zz-mail-disable.ini b/ci/php/zz-mail-disable.ini
new file mode 100644
index 000000000..d5ca294ae
--- /dev/null
+++ b/ci/php/zz-mail-disable.ini
@@ -0,0 +1,2 @@
+# Make the send mail function return properly in non-mail configured environments
+sendmail_path = /bin/true
\ No newline at end of file