diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 6cf0079..1388074 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -764,8 +764,14 @@ nis_groups:
 
 remove_nis_users: []
 #remove_nis_users:
-#   - name: gast
-#   - name: s7
+#   - name: virginia
+#   - name: marei
+#   - name: alina
+#   - name: hannah
+#   - name: kristin
+#   - name: elke
+#   - name: thea
+#   - name: katrine
 
 nis_user:
   - name: chris
@@ -782,13 +788,6 @@ nis_user:
           3865353333373661390a643564386432643532396632323664383330646430613033643130626430
           6139
 
-  - name: alina
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '140686'
-
   - name: anahit
     groups:
       - intern
@@ -818,13 +817,6 @@ nis_user:
     is_samba_user: true
     password: 'spa2014'
 
-  - name: elke
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: 'luis11'
-
   - name: eva
     groups:
       - intern
@@ -832,13 +824,6 @@ nis_user:
     is_samba_user: true
     password: '250791'
 
-  - name: hannah
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '28031973'
-
   - name: isadora
     groups:
       - intern
@@ -846,13 +831,6 @@ nis_user:
     is_samba_user: true
     password: '270988'
 
-  - name: katrine
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '200290'
-
   - name: konstantin
     groups:
       - intern
@@ -860,13 +838,6 @@ nis_user:
     is_samba_user: true
     password: '100978'
 
-  - name: kristin
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '49371'
-
   - name: lara
     groups:
       - intern
@@ -891,13 +862,6 @@ nis_user:
     is_samba_user: true
     password: 'beelen10'
 
-  - name: marei
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '220792'
-
   - name: mariam
     groups:
       - intern
@@ -994,6 +958,13 @@ nis_user:
     is_samba_user: true
     password: '2408'
 
+  - name: simone
+    groups:
+      - intern
+      - buero
+    is_samba_user: true
+    password: '031189'
+
   - name: tali
     groups:
       - intern
@@ -1001,20 +972,64 @@ nis_user:
     is_samba_user: true
     password: '220686'
 
-  - name: thea
+  - name: yang
     groups:
       - intern
       - buero
     is_samba_user: true
-    password: '060995'
+    password: '300195'
 
-  - name: virginia
-    groups:
-      - intern
-      - buero
-    is_samba_user: true
-    password: '160292'
 
+# deleted users
+#
+#  - name: marei
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '220792'
+#
+#  - name: virginia
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '160292'
+#
+#  - name: alina
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '140686'
+#
+#  - name: hannah
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '28031973'
+#
+#  - name: kristin
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '49371'
+#
+#  - name: thea
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '060995'
+#
+#  - name: katrine
+#    groups:
+#      - intern
+#      - buero
+#    is_samba_user: true
+#    password: '200290'
 
 
 # ==========
@@ -1091,22 +1106,17 @@ samba_shares:
     vfs_object_recycle: true
     recycle_path: '@Recycle.Bin'
     user:
-      - alina
       - anahit
       - andrea
       - bueropraktikum
       - chema
       - chris
       - eva
-      - hannah
       - isadora
-      - katrine
       - konstantin
-      - kristin
       - lara
       - linda
       - margit
-      - marei
       - mariam
       - matija
       - musa
@@ -1118,9 +1128,9 @@ samba_shares:
       - praktikant6
       - saravic
       - sysadm
+      - simone
       - tali
-      - thea
-      - virginia
+      - yang
   - name: Verwaltung
     path: /data/samba/verwaltung
     group_valid_users: intern
@@ -1130,30 +1140,25 @@ samba_shares:
     vfs_object_recycle: true
     recycle_path: '@Recycle.Bin'
     user:
-      - alina
       - anahit
       - andrea
       - bueropraktikum
       - chema
       - chris
       - eva
-      - hannah
       - isadora
-      - katrine
       - konstantin
-      - kristin
       - lara
       - linda
       - margit
-      - marei
       - mariam
       - matija
       - musa
       - saravic
       - sysadm
+      - simone
       - tali
-      - thea
-      - virginia
+      - yang
   - name: Multimedia
     path: /data/samba/no-backup-share/multimedia
     group_valid_users: no-backup