diff --git a/group_vars/mbr.yml b/group_vars/mbr.yml
index 6e44475..4084dcf 100644
--- a/group_vars/mbr.yml
+++ b/group_vars/mbr.yml
@@ -166,16 +166,53 @@ nis_groups:
 
 
 
-#nis_groups:
-#  - name: mbr-finanzen (wird zu vdk)
-#    group_id: 1210
-#  - name: mbr-personal (wird zu mbr-finanzen-personal)
-#    group_id: 1220
+# !! Don't forgrt to delete also user konfiguration in this file !!
+# =================================================================
+#
+#remove_nis_users: []
 
-remove_nis_users: []
+# !! Don't forgrt du delete also user konfiguration in this file !!
+# =================================================================
+#
 #remove_nis_users:
-#   - name: test
-#   - name: jennifer.prost
+#  - name: test
+#  - name: jennifer.prost
+#  - name: alexander.rasumny
+#  - name: alexander.steder
+#  - name: andreas.nowak
+#  - name: bgn_mitarbeiter_in_3
+#  - name: bianca.loy
+#  - name: carolin
+#  - name: colin.kaggl
+#  - name: daniel.poensgen
+#  - name: dora.streibl
+#  - name: felix.mueller
+#  - name: franz.mohorn
+#  - name: frederick.kannenberg
+#  - name: hamid.mohseni
+#  - name: honorar.rias1
+#  - name: isabella.greif
+#  - name: isabell.wiesner
+#  - name: jennifer.pross
+#  - name: johannes.radke
+#  - name: julius.gruber
+#  - name: katharina.zachrau
+#  - name: kristina.holzapfel
+#  - name: laura.berner
+#  - name: leah.vauth
+#  - name: leeor.fink
+#  - name: leonie.rupp
+#  - name: lokaladmin
+#  - name: marco.siegmund
+#  - name: michael.sulies
+#  - name: michael.trube
+#  - name: praktikum.rias1
+#  - name: praktikum.rias2
+#  - name: sabine.kritter
+#  - name: tanja.kinzel
+#  - name: theresa.kuehnert
+#  - name: till.hendlmeier
+#  - name: vanessa.gelardo
 
 nis_user:
 
@@ -211,31 +248,31 @@ nis_user:
           3638386337333636390a393738373935646638383237373663376434366361363938346335663438
           6637
 
-  - name: lokaladmin
-    groups:
-      - technik
-      - mbr-buero
-      - mbr-finanzen-personal
-      - mbr-kamera
-      - mbr-admins
-      - ag-antisem
-      - vdk
-      - rias-berlin
-      - rias-berlin-finanzen-personal
-      - rias-bund
-      - rias-bund-finanzen-personal
-      - bgn
-      - bgn-finanzen-personal
-      - regishut
-      - regishut-personal-finanzen
-      - buero-scan
-      - bmb
-      - all-users
-      - betriebsrat
-      - direx
-      - direx-personal-finanzen
-    is_samba_user: true
-    password: 'd4r1usz'
+#  - name: lokaladmin
+#    groups:
+#      - technik
+#      - mbr-buero
+#      - mbr-finanzen-personal
+#      - mbr-kamera
+#      - mbr-admins
+#      - ag-antisem
+#      - vdk
+#      - rias-berlin
+#      - rias-berlin-finanzen-personal
+#      - rias-bund
+#      - rias-bund-finanzen-personal
+#      - bgn
+#      - bgn-finanzen-personal
+#      - regishut
+#      - regishut-personal-finanzen
+#      - buero-scan
+#      - bmb
+#      - all-users
+#      - betriebsrat
+#      - direx
+#      - direx-personal-finanzen
+#    is_samba_user: true
+#    password: 'd4r1usz'
 
   - name: sysadm
     groups:
@@ -279,14 +316,6 @@ nis_user:
 # Technik
 # ---
 
-  - name: leah.vauth
-    groups:
-      - all-users
-      - buero-scan
-      - technik
-    is_samba_user: true
-    password: 'cgsRq9-IP.X2'
-
   - name: pierre.ahrent
     groups:
       - all-users
@@ -398,37 +427,6 @@ nis_user:
     is_samba_user: true
     password: 'LoS_r3f_20_AS!'
 
-  - name: isabell.wiesner
-    groups:
-      - all-users
-      - buero-scan
-      - vdk
-      - bgn
-      - bgn-finanzen-personal
-      - mbr-buero
-      - mbr-finanzen-personal
-      - rias-bund
-      - rias-bund-finanzen-personal
-      - rias-berlin
-      - rias-berlin-finanzen-personal
-      - regishut
-      - regishut-personal-finanzen
-      - direx
-      - direx-personal-finanzen
-    is_samba_user: true
-    password: 'XY_bunt_2020!'
-
-  - name: leonie.rupp
-    groups:
-      - all-users
-      - buero-scan
-      - rias-bund
-      - rias-bund-finanzen-personal
-      - rias-berlin
-      - rias-berlin-finanzen-personal
-    is_samba_user: true
-    password: '3jzs.wv-4TX/'
-
   - name: luise.schirmer
     groups:
       - all-users
@@ -459,13 +457,6 @@ nis_user:
 # BgN
 # ---
 
-  - name: bgn_mitarbeiter_in_3
-    groups:
-      - all-users
-      - buero-scan
-    is_samba_user: true
-    password: 'frueh_FREI_22!'
-
   - name: daniel.weber
     groups:
       - all-users
@@ -495,17 +486,6 @@ nis_user:
     is_samba_user: true
     password: 'C+j3.w5.NJCI'
 
-  - name: laura.berner 
-    groups:
-      - all-users
-      - betriebsrat 
-      - buero-scan
-      - bgn
-      - bgn-finanzen-personal
-      - mbr-buero
-    is_samba_user: true
-    password: 'WAS_22_informi3r3n!'
-
   - name: praktikum.bgn1
     groups:
       - all-users
@@ -513,15 +493,6 @@ nis_user:
     is_samba_user: true
     password: 'MPL_baerin_20!'
 
-  - name: theresa.kuehnert
-    groups:
-      - all-users
-      - buero-scan
-      - bgn
-      - bgn-finanzen-personal
-    is_samba_user: true
-    password: 'sf-j.zjP46Fn'
-
   - name: ulf.balmer
     groups:
       - all-users
@@ -539,13 +510,13 @@ nis_user:
 # BMB
 # ---
 
-  - name: jennifer.pross
-    groups:
-      - all-users
-      - buero-scan
-      - bmb
-    is_samba_user: true
-    password: 'V-S9Y/R+Am7H'
+#  - name: jennifer.pross
+#    groups:
+#      - all-users
+#      - buero-scan
+#      - bmb
+#    is_samba_user: true
+#    password: 'V-S9Y/R+Am7H'
 
 # ---
 # MBR
@@ -587,16 +558,6 @@ nis_user:
     is_samba_user: true
     password: 'G6Hz.ev/e24E'
 
-  - name: felix.mueller
-    groups:
-      - all-users
-      - betriebsrat 
-      - buero-scan
-      - technik
-      - mbr-buero
-    is_samba_user: true
-    password: 'U_i5zAR5H+ti'
-
   - name: florian.heuermann
     groups:
       - all-users
@@ -613,14 +574,6 @@ nis_user:
     is_samba_user: true
     password: 'L.35c-CgvZn3'
 
-  - name: hamid.mohseni
-    groups:
-      - all-users
-      - buero-scan
-      - mbr-buero
-    is_samba_user: true
-    password: 'TFhCW9J4Vn4F'
-
   - name: honorar.mbr1
     groups:
       - all-users
@@ -638,14 +591,6 @@ nis_user:
     is_samba_user: true
     password: 'kQviLU-4rA_2'
 
-  - name: isabella.greif
-    groups:
-      - all-users
-      - buero-scan
-      - mbr-buero
-    is_samba_user: true
-    password: '5zv-Bo2.Cio9'
-
   - name: ljiljana.heise
     groups:
       - all-users
@@ -654,14 +599,6 @@ nis_user:
     is_samba_user: true
     password: 'Ib_k/c75W-u6'
 
-  - name: johannes.radke
-    groups:
-      - all-users
-      - buero-scan
-      - mbr-buero
-    is_samba_user: true
-    password: 'Furzf4brik!'
-
   - name: judith.heinmueller
     groups:
       - all-users
@@ -717,16 +654,6 @@ nis_user:
     is_samba_user: true
     password: 'V1v@H@f3rdr1nk'
 
-  - name: michael.sulies
-    groups:
-      - all-users
-      - betriebsrat 
-      - buero-scan
-      - ag-antisem
-      - mbr-buero
-    is_samba_user: true
-    password: 'Cryst4lp4l4c3'
-
   - name: nina.rink
     groups:
       - all-users
@@ -782,23 +709,6 @@ nis_user:
 # RIAS Berlin und Bund
 # ---
 
-  - name: andreas.nowak
-    groups:
-      - all-users
-      - buero-scan
-      - rias-bund
-    is_samba_user: true
-    password: 'N/m3/UM/362b'
-
-  - name: alexander.rasumny
-    groups:
-      - all-users
-      - buero-scan
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'twT9Rjbv9mjq'
-
   - name: benjamin 
     groups:
       - all-users
@@ -812,16 +722,6 @@ nis_user:
     is_samba_user: true
     password: 'C2-0U#ch'
 
-  - name: bianca.loy
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'ctnrk3CczcJ9'
-
   - name: christian.obermueller
     groups:
       - all-users
@@ -831,76 +731,6 @@ nis_user:
     is_samba_user: true
     password: 'i6...rs2ILRn'
 
-  - name: colin.kaggl
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '3ZvY-I3-Z.2v'
-
-  - name: daniel.poensgen
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'rcMRCm7jcpbp'
-
-  - name: dora.streibl
-    groups:
-      - all-users
-      - buero-scan
-      - technik
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '6jA,nmD,fdK!'
-
-#  - name: dorina.feldmann
-#    groups:
-#      - all-users
-#      - buero-scan
-#      - rias-bund
-#      - rias-berlin
-#    is_samba_user: true
-#    password: '17?4XPQ_!abc'
-
-  - name: franz.mohorn
-    groups:
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-
-    password: 'Kq5/b.4uWZIV'
-
-  - name: frederick.kannenberg
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'riasFK2019!#'
-
-  - name: honorar.rias1
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '6jA,nmD,fdK!'
-
   - name: jonas.empen
     groups:
       - all-users
@@ -920,73 +750,6 @@ nis_user:
     is_samba_user: true
     password: '-a2%3bTzkW.A'
 
-  - name: julius.gruber
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'uY-SbLux-4a9'
-
-  - name: katharina.zachrau
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '3X.mf/U3NXKe'
-
-  - name: leeor.fink
-    groups:
-      - all-users
-      - buero-scan
-      - rias-bund
-    is_samba_user: true
-    password: 'c.s7-ruA7NEo'
-
-  - name: marco.siegmund
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'fTy-AY52.F-p'
-
-#  - name: pia.lamberty
-#    groups:
-#      - all-users
-#      - buero-scan
-#      - rias-bund
-#      - rias-berlin
-#    is_samba_user: true
-#    password: 'oasd31*as+Q%'
-
-  - name: praktikum.rias1
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '7z7F%d3cv_dfjz'
-
-  - name: praktikum.rias2
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'Q56V.6kf/JLQ'
-
   - name: ruth.hatlapa
     groups:
       - all-users
@@ -999,34 +762,6 @@ nis_user:
     is_samba_user: true
     password: 'q2Sc.C7-6hZR'
 
-  - name: tanja.kinzel
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: 'sd7/SAqzU+Qi'
-
-  - name: till.hendlmeier
-    groups:
-      - all-users
-      - buero-scan
-      - ag-antisem
-      - rias-bund
-      - rias-berlin
-    is_samba_user: true
-    password: '3/+v_7AGivxc'
-
-  - name: vanessa.gelardo
-    groups:
-      - all-users
-      - buero-scan
-      - rias-bund
-    is_samba_user: true
-    password: 'Vr.6v/4hWZEm'
-
 
 # ---
 # Regishut
@@ -1042,14 +777,6 @@ nis_user:
     is_samba_user: true
     password: 'R3GI_20_poliz_!'
 
-  - name: alexander.steder
-    groups:
-      - all-users
-      - buero-scan
-      - regishut
-    is_samba_user: true
-    password: 'SHUT_20_s3nc3!'
-
   - name: christin.sommerfeld
     groups:
       - all-users