diff --git a/backend/src/main/docker-files/docker-compose.yml b/backend/src/main/docker-files/docker-compose.yml
index 07556a417..d065da0d4 100644
--- a/backend/src/main/docker-files/docker-compose.yml
+++ b/backend/src/main/docker-files/docker-compose.yml
@@ -7,5 +7,8 @@ services:
       - 1025:1025
       - 8025:8025
     container_name: mailhog
-    environment:
-        - MH_SMTP_BIND_ADDR=0.0.0.0:1025
+    networks:
+        - backend
+
+networks:
+    backend:
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 7eec3663d..a9beb4ac4 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -67,10 +67,10 @@ shibui.nameid-filter-ui-schema-location=classpath:nameid-filter.schema.json
 # shibui.metadataProviders.taskRunRate=30000
 
 # Email configuration (local mailhog)
-spring.mail.host=localhost
+spring.mail.host=mailhog
 spring.mail.port=1025
 spring.mail.username=username
 spring.mail.password=password
 spring.mail.properties.mail.smtp.auth=false
 spring.mail.properties.mail.smtp.starttls.enable=false
-shibui.system.email.address=doNotReply@shibui.org
\ No newline at end of file
+shibui.system.email.address=doNotReply@shibui.org