diff --git a/comanage-registry-mailman/core/Dockerfile b/comanage-registry-mailman/core/Dockerfile
index 637eef4..784a2da 100644
--- a/comanage-registry-mailman/core/Dockerfile
+++ b/comanage-registry-mailman/core/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
         postgresql-client \
         python3-dev \
     && pip install psycopg2 \
-                   mailman==3.2 \
+                   mailman==3.2.2 \
                    mailman-hyperkitty==1.1.0 \
                    pymysql \
     && adduser --system mailman
diff --git a/comanage-registry-mailman/web/Dockerfile b/comanage-registry-mailman/web/Dockerfile
index 25a493f..80155d4 100644
--- a/comanage-registry-mailman/web/Dockerfile
+++ b/comanage-registry-mailman/web/Dockerfile
@@ -24,6 +24,8 @@ RUN apt-get update \
         gcc \
         libc-dev \
         libcurl4-openssl-dev \
+        libffi-dev \
+        libffi6 \
         libmariadbclient-dev \
         netcat-traditional \
         postgresql-client \
@@ -31,9 +33,9 @@ RUN apt-get update \
     && pip install --upgrade pip \
     && pip install django==2.1.5 \
     && pip install \
-        mailmanclient==3.2.1 \
-        postorius==1.2.3 \
-        hyperkitty==1.2.1 \
+        mailmanclient==3.2.2 \
+        postorius==1.2.4 \
+        hyperkitty==1.2.2 \
         django-mailman3==1.2.0 \
         whoosh \
         uwsgi \
diff --git a/comanage-registry-mailman/web/docker-entrypoint.sh b/comanage-registry-mailman/web/docker-entrypoint.sh
index 5fa07d7..39be734 100755
--- a/comanage-registry-mailman/web/docker-entrypoint.sh
+++ b/comanage-registry-mailman/web/docker-entrypoint.sh
@@ -166,6 +166,7 @@ fi
 if [[ -e /opt/mailman-web-data/settings_local.py ]]; then
     echo "Copying settings_local.py ..."
     cp /opt/mailman-web-data/settings_local.py /opt/mailman-web/settings_local.py
+    chown mailman:mailman /opt/mailman-web/settings_local.py
 fi
 
 # Collect static for the django installation.
diff --git a/comanage-registry-mailman/web/mailman-web/settings.py b/comanage-registry-mailman/web/mailman-web/settings.py
index 4a05496..a1f9621 100644
--- a/comanage-registry-mailman/web/mailman-web/settings.py
+++ b/comanage-registry-mailman/web/mailman-web/settings.py
@@ -111,7 +111,6 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django_mail_header.middleware.MailHeaderMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -239,9 +238,9 @@
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = os.environ.get('SMTP_HOST', '172.19.199.1')
 EMAIL_PORT = os.environ.get('SMTP_PORT', 25)
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
+EMAIL_HOST_USER = os.environ.get('SMTP_HOST_USER', '')
+EMAIL_HOST_PASSWORD = os.environ.get('SMTP_HOST_PASSWORD', '')
+EMAIL_USE_TLS = os.environ.get('SMTP_USE_TLS', False)
 
 # Compatibility with Bootstrap 3
 from django.contrib.messages import constants as messages  # flake8: noqa
diff --git a/comanage-registry-mailman/web/mailman-web/uwsgi.ini b/comanage-registry-mailman/web/mailman-web/uwsgi.ini
index 4a24c52..0c68723 100644
--- a/comanage-registry-mailman/web/mailman-web/uwsgi.ini
+++ b/comanage-registry-mailman/web/mailman-web/uwsgi.ini
@@ -14,8 +14,7 @@ wsgi-file = wsgi.py
 
 # Setup default number of processes and threads per process.
 master = true
-process = 2
-threads = 2
+process = 4
 
 # Drop privielges and don't run as root.
 uid = mailman