diff --git a/group_vars/mail b/group_vars/mail
index 4c8fa65..5a14b56 100644
--- a/group_vars/mail
+++ b/group_vars/mail
@@ -1,66 +1,89 @@
 dovecot_users:
   ccchb.de:
-    crest: '{BLF-CRYPT}$2y$05$Yz0c1tu.a3.SFxgCAkJb9O3aIK8vxMCTrxLzjAs8HFf2ySW4zs2J.'
-    deelkar: '{BLF-CRYPT}$2y$05$tzLicykk.2DfjPZkQTZAJOuUgCtsnL5f1BgkJSJ7YbSOZ5DWRPP/y'
-    jpa: '{BLF-CRYPT}$2y$05$/Q7zyzR3XzGajZQ5BCYObOlKPVYqonF7fjup0ZuJzSFPO3TZoPrXm'
-    inj4n: '{BLF-CRYPT}$2y$05$h34aPYEN5/p2AnzPtg6wweh14RdPl9ZpEuqyahkl6s3oYWVwzggvi'
+    crest:     '{BLF-CRYPT}$2y$05$Yz0c1tu.a3.SFxgCAkJb9O3aIK8vxMCTrxLzjAs8HFf2ySW4zs2J.'
+    deelkar:   '{BLF-CRYPT}$2y$05$tzLicykk.2DfjPZkQTZAJOuUgCtsnL5f1BgkJSJ7YbSOZ5DWRPP/y'
+    jpa:       '{BLF-CRYPT}$2y$05$/Q7zyzR3XzGajZQ5BCYObOlKPVYqonF7fjup0ZuJzSFPO3TZoPrXm'
+    inj4n:     '{BLF-CRYPT}$2y$05$h34aPYEN5/p2AnzPtg6wweh14RdPl9ZpEuqyahkl6s3oYWVwzggvi'
     zeltophil: '{BLF-CRYPT}$2y$05$rct9cKgRnB/X7tZW7MXNUeIfadqCRc..dCMG4DB1fZdefH1Qx6FAq'
+    haecksen:  '{BLF-CRYPT}$2y$05$e2R8ucHVPlZuI39Uy4iX3.EaRszPJ01itsPJfQa0FIeYzBuiGxUZW'
 
 mlmmj_lists:
   - name: 'vorstand'
     domain: 'lists.ccchb.de'
     description: CCC Bremen Vorstand Mailingliste
+    prefix: '[CCCHB Vorstand]'
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
     addresses:
       - vorstand@lists.ccchb.de
       - vorstand@ccchb.de
     subscription_moderated: yes
-    prefix: '[CCCHB Vorstand]'
 
   - name: ccc
     domain: lists.ccchb.de
     description: CCC Bremen Mailinglist
+    prefix: '[CCCHB]'
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
+      - zeltophil@ccchb.de
     addresses:
       - ccc@lists.ccchb.de
       - ccc@ccchb.de
     subscription_moderated: no
-    prefix: '[CCCHB]'
+    subscribers_only: yes
+    moderate_nonsubscribers: yes
 
   - name: announce
     domain: lists.ccchb.de
     description: CCC Bremen Announce Mailinglist
+    prefix: '[CCCHB Announce]'
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
     addresses:
       - announce@lists.ccchb.de
       - announce@ccchb.de
     subscription_moderated: no
-    prefix: '[CCCHB Announce]'
+    subscribers_only: yes
+    moderate_nonsubscribers: yes
 
   - name: haecksen
     domain: lists.ccchb.de
     description: CCC Bremen Haecksen Mailinglist
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
+      - moni_ka@posteo.de
     addresses:
       - haecksen@lists.ccchb.de
-      - haecksen@ccchb.de
     subscription_moderated: no
     prefix: '[CCCHB Haecksen]'
+    subscribers_only: yes
+    moderate_nonsubscribers: yes
 
   - name: mitglieder
     domain: lists.ccchb.de
     description: CCC Bremen Mitglieder Mailinglist
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
+      - zeltophil@ccchb.de
     addresses:
       - mitglieder@lists.ccchb.de
       - mitglieder@ccchb.de
     subscription_moderated: yes
     prefix: '[CCCHB Mitglieder]'
+    subscribers_only: yes
+    moderate_nonsubscribers: yes
 
   - name: presse
     domain: lists.ccchb.de
     description: CCC Bremen Presse Mailinglist
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
     addresses:
       - presse@lists.ccchb.de
       - presse@ccchb.de
@@ -71,8 +94,12 @@ mlmmj_lists:
     domain: lists.ccchb.de
     description: NOC4K Mailinglist
     owner: crest@ccchb.de
+    moderators:
+      - crest@ccchb.de
     addresses:
       - 34c3-nochd@lists.ccchb.de
       - 34c3-nochd@ccchb.de
     subscription_moderated: no
     prefix: '[NOC4K]'
+    subscribers_only: yes
+    moderate_nonsubscribers: yes