diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 39caaaf..cca372d 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -8,34 +8,19 @@ mailman_conf_file:
     - watch_in:
       - module: mailman_restart
 
-mailman_hyperkitty_settings_file:
+mailman_web_settings_file:
   file.managed:
-    - name: /srv/www/webapps/mailman/hyperkitty/settings.py
+    - name: /srv/www/webapps/mailman/web/settings.py
     - source: salt://profile/mailman3/files/settings.py
     - template: jinja
     - require_in:
-      - service: mailman_hyperkitty_service
+      - service: mailman_web_service
     - watch_in:
-      - module: mailman_hyperkitty_restart
+      - module: mailman_web_restart
 
-mailman_postorius_settings_file:
+mailman_web_disable_signup:
   file.managed:
-    - name: /srv/www/webapps/mailman/postorius/settings_local.py
-    - source: salt://profile/mailman3/files/settings_local.py
-    - template: jinja
-    - require_in:
-      - service: mailman_postorius_service
-    - watch_in:
-      - module: mailman_postorius_restart
-
-mailman_postorius_disable_signup:
-  file.managed:
-    - name: /srv/www/webapps/mailman/postorius/django_fedora_nosignup.py
-    - source: salt://profile/mailman3/files/django_fedora_nosignup.py
-
-mailman_hyperkitty_disable_signup:
-  file.managed:
-    - name: /srv/www/webapps/mailman/hyperkitty/django_fedora_nosignup.py
+    - name: /srv/www/webapps/mailman/web/django_fedora_nosignup.py
     - source: salt://profile/mailman3/files/django_fedora_nosignup.py
 
 mailman_hyperkitty_conf:
@@ -44,29 +29,22 @@ mailman_hyperkitty_conf:
     - source: salt://profile/mailman3/files/hyperkitty.cfg
     - template: jinja
     - require_in:
-      - service: mailman_hyperkitty_service
+      - service: mailman_web_service
     - watch_in:
-      - module: mailman_hyperkitty_restart
-
-/srv/www/webapps/mailman/postorius/secret.txt:
-  file.managed:
-    - contents_pillar: profile:mailman3:secret_txt
-    - mode: 640
-    - user: postorius
-    - group: postorius
+      - module: mailman_web_restart
 
-/srv/www/webapps/mailman/hyperkitty/secret.txt:
+/srv/www/webapps/mailman/web/secret.txt:
   file.managed:
     - contents_pillar: profile:mailman3:secret_txt
     - mode: 640
-    - user: hyperkitty
-    - group: hyperkitty
+    - user: mailmanweb
+    - group: mailmanweb
 
 mailman_nginx_conf:
   file.managed:
     - name: /etc/nginx/conf.d/lists.opensuse.org.conf
     - source: salt://profile/mailman3/files/nginx.conf
     - require_in:
-      - service: mailman_hyperkitty_service
+      - service: mailman_web_service
     - watch_in:
-      - module: mailman_hyperkitty_restart
+      - module: mailman_web_restart
diff --git a/salt/profile/mailman3/init.sls b/salt/profile/mailman3/init.sls
index 8d5f44a..b568b1b 100644
--- a/salt/profile/mailman3/init.sls
+++ b/salt/profile/mailman3/init.sls
@@ -15,26 +15,14 @@ mailman_restart:
     - require:
       - service: mailman_service
 
-mailman_hyperkitty_service:
+mailman_web_service:
   service.running:
-    - name: hyperkitty
+    - name: mailman-web.target
     - enable: True
 
-mailman_hyperkitty_restart:
+mailman_web_restart:
   module.wait:
     - name: service.restart
-    - m_name: hyperkitty
+    - m_name: mailman-web.target
     - require:
-      - service: mailman_hyperkitty_service
-
-mailman_postorius_service:
-  service.running:
-    - name: postorius
-    - enable: True
-
-mailman_postorius_restart:
-  module.wait:
-    - name: service.restart
-    - m_name: postorius
-    - require:
-      - service: mailman_postorius_service
+      - service: mailman_web_service
diff --git a/salt/profile/mailman3/master.sls b/salt/profile/mailman3/master.sls
index 93a4ded..b45bf4a 100644
--- a/salt/profile/mailman3/master.sls
+++ b/salt/profile/mailman3/master.sls
@@ -15,19 +15,11 @@ https://github.com/openSUSE/lists-o-o.git:
   file.symlink:
     - target: /var/lib/mailman/lists-o-o/mailman-templates
 
-/srv/www/webapps/mailman/hyperkitty/templates:
+/srv/www/webapps/mailman/web/templates:
   file.symlink:
     - target: /var/lib/mailman/lists-o-o/webui-templates
 
-/srv/www/webapps/mailman/hyperkitty/static-openSUSE:
-  file.symlink:
-    - target: /var/lib/mailman/lists-o-o/webui-assets
-
-/srv/www/webapps/mailman/postorius/templates:
-  file.symlink:
-    - target: /var/lib/mailman/lists-o-o/webui-templates
-
-/srv/www/webapps/mailman/postorius/static-openSUSE:
+/srv/www/webapps/mailman/web/static-openSUSE:
   file.symlink:
     - target: /var/lib/mailman/lists-o-o/webui-assets