diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 2536b1c..9047165 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -15,11 +15,25 @@ profile:
   mailman3:
     admin_user: mailman
     database_user: mailman
-    database_host: postgres.infra.opensuse.org
+    database_host: 192.168.47.4
     server_list:
       - lists.opensuse.org
       - mailman3.infra.opensuse.org
 
+nginx:
+  ng:
+    servers:
+      managed:
+        lists.opensuse.org.conf:
+          config:
+            - server:
+                - server_name: lists.opensuse.org
+                - listen:
+                    - 80
+                    - default_server
+                - server: unix:///var/lib/mailman/server.sock
+          enabled: True
+
 sudoers:
   included_files:
     /etc/sudoers.d/group_mailman3-admins:
diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index e224774..5324fcc 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -6,7 +6,7 @@ include:
 
 profile:
   matrix:
-    database_host: localhost
+    database_host: 192.168.47.4
     database_name: matrix
     database_user: matrix
     appservices:
diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 763cb52..5e6b6a0 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -16,6 +16,11 @@ mailman_webui_dir:
   file.directory:
     - name: /var/lib/mailman_webui/
 
+mailman_log_dir:
+  file.directory:
+    - name: /var/log/mailman/
+    - user: mailman
+
 # Preparation for when we have a theme for hyperkitty
 
 mailman_webui_template_dir:
@@ -63,7 +68,7 @@ mailman_webui_settings_file:
 
 mailman_webui_urls_file:
   file.managed:
-    - name: /var/lib/mailman/urls.py
+    - name: /var/lib/mailman_webui/urls.py
     - source: salt://profile/mailman3/files/urls.py
     - require:
       - file: mailman_webui_dir
@@ -101,6 +106,21 @@ mailman_uwsgi_conf:
     - watch_in:
       - module: mailman_restart
 
+{% set logfiles = ['uwsgi', 'uwsgi-cron', 'uwsgi-error', 'uwsgi-qcluster'] %}
+
+{% for logfile in logfiles %}
+mailman_{{ logfile }}_file:
+  file.managed:
+    - name: /var/log/mailman/{{ logfile }}.log
+    - user: mailman
+    - require:
+      - file: mailman_log_dir
+    - require_in:
+      - service: mailman_service
+    - watch_in:
+      - module: mailman_restart
+{% endfor %}
+
 mailman_hyperkitty_conf:
   file.managed:
     - name: /etc/mailman/hyperkitty.cfg
diff --git a/salt/profile/mailman3/files/mailman.service b/salt/profile/mailman3/files/mailman.service
index 4d94013..eba4acf 100644
--- a/salt/profile/mailman3/files/mailman.service
+++ b/salt/profile/mailman3/files/mailman.service
@@ -9,7 +9,7 @@ RestartSec=3
 User=mailman
 Group=mailman
 WorkingDirectory=/var/lib/mailman_webui/
-ExecStart=uwsgi --ini /etc/mailman_webui/uwsgi.ini
+ExecStart=/usr/sbin/uwsgi --ini /etc/mailman/uwsgi.ini
 
 [Install]
 WantedBy=multi-user.target
diff --git a/salt/profile/mailman3/files/settings.py b/salt/profile/mailman3/files/settings.py
index 7452db0..188fd1b 100644
--- a/salt/profile/mailman3/files/settings.py
+++ b/salt/profile/mailman3/files/settings.py
@@ -58,7 +58,6 @@ TEMPLATES = [
         'DIRS': [
             BASE_DIR + '/templates/',
         ],
-        'APP_DIRS': True,
         'OPTIONS': {
             'loaders': [
                 ('django.template.loaders.cached.Loader', [
diff --git a/salt/profile/mailman3/files/uwsgi.ini b/salt/profile/mailman3/files/uwsgi.ini
index b15f707..91c4dec 100644
--- a/salt/profile/mailman3/files/uwsgi.ini
+++ b/salt/profile/mailman3/files/uwsgi.ini
@@ -2,7 +2,7 @@
 #
 [uwsgi]
 # Port on which uwsgi will be listening.
-uwsgi-socket = 127.0.0.1:80
+uwsgi-socket = /var/lib/mailman/server.sock
 
 # Move to the directory wher the django files are.
 chdir = /var/lib/mailman_webui
@@ -20,7 +20,7 @@ uid = 4200
 gid = 4200
 
 # Setup the django_q related worker processes.
-attach-daemon = ./manage.py qcluster
+attach-daemon = python3 /var/lib/mailman_webui/manage.py qcluster
 
 # Setup the request log.
 req-logger = file://var/log/mailman/uwsgi.log
diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls
index 44092a9..d521162 100644
--- a/salt/profile/mailman3/mailman.sls
+++ b/salt/profile/mailman3/mailman.sls
@@ -1,6 +1,7 @@
 mailman_pgks:
   pkg.installed:
     - pkgs:
+      - uwsgi
       - python3-xapian
       - python3-psycopg2
       - python3-mailman