diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml
old mode 100755
new mode 100644
index 2e48cbe..e56ba79
--- a/roles/common/vars/main.yml
+++ b/roles/common/vars/main.yml
@@ -76,11 +76,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -91,12 +91,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -136,11 +136,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -151,12 +151,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -176,11 +176,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -191,12 +191,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -216,11 +216,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -231,12 +231,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -265,11 +265,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -280,12 +280,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -305,11 +305,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -320,12 +320,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -345,11 +345,11 @@ samba_shares:
      - christina.wendt
      - chris
      - daniel.poensgen
-     - doku2
-     - doku_4
-     - doku_7
+     - doku.mbr2
+     - doku.mbr4
      - dorina.feldmann
      - franziska
+     - hamid.mohseni
      - johannes.radke
      - judith.heinmueller
      - kristina.holzapfel
@@ -360,12 +360,12 @@ samba_shares:
      - michael.sulies
      - michael.trube
      - pia.lamberty
-     - praktikum
-     - praktikum_rias
-     - praktikum2
-     - praktikum2_rias
-     - praktikum3
-     - praktikum4
+     - honorar.mbr1
+     - praktikum.rias1
+     - praktikum.mbr2
+     - bianca.loy
+     - praktikum.rias2
+     - honorar.rias1
      - sabine.kritter
      - samuel.signer
      - scan
@@ -374,18 +374,21 @@ samba_shares:
      - ulf.balmer
 
 nis_domain: mbr-bln.netz
-#nis_domain: local.netz
 
 nis_server_address: 192.168.112.10
 
 nis_server_name: file-mbr.mbr-bln.netz
-#nis_server_name: luna.local.netz
 
 nis_common_packages:
   - nis
   - nscd
 
 nis_deleted_user: []
+#nis_deleted_user:
+#  - name: praktikum
+#  - name: praktikum2_rias
+#  - name: praktikum3
+#  - name: praktikum4
 
 
 nis_base_home: /data/home
@@ -544,16 +547,16 @@ nis_user:
      - mbr-buero
     is_samba_user: true
     password: 'rcMRCm7jcpbp'
-  - name: doku_4
+  - name: doku.mbr2
+    groups:
+     - mbr-buero
+    is_samba_user: true
+    password: '*M0ss4d*'
+  - name: doku.mbr4
     groups:
      - mbr-buero
     is_samba_user: true
     password: 'PwmNvPh9KM4T'
-  - name: doku_7
-    groups:
-     - mbr-buero
-    is_samba_user: true
-    password: 'TFhCW9J4Vn4F'
   - name: dorina.feldmann
     groups:
      - mbr-buero
@@ -569,11 +572,11 @@ nis_user:
      - mbr-buero
     is_samba_user: true
     password: 'riasFK2019!#'
-  - name: doku2
+  - name: hamid.mohseni
     groups:
      - mbr-buero
     is_samba_user: true
-    password: '*M0ss4d*'
+    password: 'TFhCW9J4Vn4F'
   - name: johannes.radke
     groups:
      - mbr-buero
@@ -626,32 +629,32 @@ nis_user:
      - mbr-buero
     is_samba_user: true
     password: 'oasd31*as+Q%'
-  - name: praktikum
+  - name: honorar.mbr1
     groups:
      - mbr-buero
     is_samba_user: true
     password: '_F313r4b3nd*'
-  - name: praktikum_rias
+  - name: praktikum.rias1
     groups:
      - mbr-buero
     is_samba_user: true
     password: '7z7F%d3cv_dfjz'
-  - name: praktikum2
+  - name: praktikum.mbr2
     groups:
      - mbr-buero
     is_samba_user: true
     password: '20praktikum213'
-  - name: praktikum2_rias
+  - name: bianca.loy
     groups:
      - mbr-buero
     is_samba_user: true
     password: 'ctnrk3CczcJ9'
-  - name: praktikum3
+  - name: praktikum.rias2
     groups:
      - mbr-buero
     is_samba_user: true
     password: 'Q56V.6kf/JLQ'
-  - name: praktikum4
+  - name: honorar.rias1
     groups:
      - mbr-buero
     is_samba_user: true