diff --git a/docker-compose.yml b/docker-compose.yml
index cbabb0b..a120e6c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,13 +41,18 @@
     build:
       context: .
       dockerfile: gerrit/Dockerfile
-    env_file: gerrit/environment
+    hostname: review.${SA_PUBLIC_DOMAIN_NAME}
+    env_file:
+      - gerrit/environment
+      - environment
     environment:
+      - GERRIT_USER_EMAIL=gerrit@${SA_PUBLIC_DOMAIN_NAME}
       - HTTPD_LISTEN_URL=proxy-https://*:8080/
     networks:
       - gerritnet
     volumes:
       - ./logs/gerrit/:/var/gerrit/logs/:rw
+      - ./mail/passwd/gerrit/:/var/gerrit/passwd/:rw
       - ./gerrit/etc/:/var/gerrit/etc/:rw
       - ./gerrit/db/:/var/gerrit/db/:rw
       - ./gerrit/git/:/var/gerrit/git/:rw
@@ -69,10 +74,13 @@
       - "465:465"  # ESMTP (implicit TLS)
       - "587:587"  # ESMTP (explicit TLS => STARTTLS)
       - "993:993"  # IMAP4 (implicit TLS)
+    networks:
+      - gerritnet
     volumes:
       - ./logs/mail-supervisor/:/var/log/supervisor/:rw
       - ./logs/mail/:/var/log/mail/:rw
       - ./certs/:/etc/letsencrypt/:ro
+      - ./mail/passwd/:/tmp/passwd/:ro
       - ./mail/data/:/var/mail/:rw
       - ./mail/state/:/var/mail-state/:rw
       - ./mail/config/:/tmp/docker-mailserver/:rw