diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 8b34b78..2536b1c 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -1,3 +1,8 @@
+{% if salt['grains.get']('include_secrets', True) %}
+include:
+  - secrets.role.mailman3
+{% endif %}
+
 # Special config for mailman in the postfix relay
 profile:
   postfix:
diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 4c743c0..763cb52 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -42,7 +42,6 @@ mailman_webui_manage_file:
   file.managed:
     - name: /var/lib/mailman_webui/manage.py
     - source: salt://profile/mailman3/files/manage.py
-    - template: jinja
     - require:
       - file: mailman_webui_dir
     - require_in:
@@ -66,7 +65,6 @@ mailman_webui_urls_file:
   file.managed:
     - name: /var/lib/mailman/urls.py
     - source: salt://profile/mailman3/files/urls.py
-    - template: jinja
     - require:
       - file: mailman_webui_dir
     - require_in:
@@ -78,7 +76,6 @@ mailman_webui_wsgi_file:
   file.managed:
     - name: /var/lib/mailman_webui/wsgi.py
     - source: salt://profile/mailman3/files/wsgi.py
-    - template: jinja
     - require:
       - file: mailman_webui_dir
     - require_in:
@@ -97,7 +94,6 @@ mailman_uwsgi_conf:
   file.managed:
     - name: /etc/mailman/uwsgi.ini
     - source: salt://profile/mailman3/files/uwsgi.ini
-    - template: jinja
     - require:
       - file: mailman_conf_dir
     - require_in:
diff --git a/salt/profile/mailman3/files/settings.py b/salt/profile/mailman3/files/settings.py
index 6a81e43..7452db0 100644
--- a/salt/profile/mailman3/files/settings.py
+++ b/salt/profile/mailman3/files/settings.py
@@ -30,7 +30,7 @@ from mailman_web.settings.base import *
 from mailman_web.settings.mailman import *
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '{{ pillar['profile']['lists']['secret_key'] }}'
+SECRET_KEY = '{{ pillar['profile']['mailman3']['secret_key'] }}'
 
 ADMINS = (
      ('openSUSE Mailing Lists Admins', 'admin@opensuse.org'),
diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls
index c10c936..a9a04d5 100644
--- a/salt/profile/mailman3/mailman.sls
+++ b/salt/profile/mailman3/mailman.sls
@@ -66,7 +66,7 @@ django-admin runjobs yearly  --pythonpath /var/lib/mailman --settings settings:
     - minute: 0
     - hour: 0
     - daymonth: 1
-    - month: 0
+    - month: 1
 
 django-admin runjobs minutely  --pythonpath /var/lib/mailman --settings settings:
  cron.present: