diff --git a/group_vars/flr.yml b/group_vars/flr.yml
index 80b80ee..f391c9a 100644
--- a/group_vars/flr.yml
+++ b/group_vars/flr.yml
@@ -158,9 +158,9 @@ nis_user:
 
   - name: mara
     groups:
-      - team
-      - amif
+      - foerderung
       - quali
+      - team
     is_samba_user: true
     password: '20/mara_16!'
 
@@ -341,7 +341,6 @@ samba_shares:
       - hannah
       - kamue
       - lotta
-      - mara
       - vincent
 
   - name: Quali
@@ -386,6 +385,7 @@ samba_shares:
       - chris
       - hannah
       - kamue
+      - mara
 
   - name: Buchhaltung
     path: /data/samba/Buchhaltung
diff --git a/group_vars/mbr.yml b/group_vars/mbr.yml
index 8d8f6cc..ba7f742 100644
--- a/group_vars/mbr.yml
+++ b/group_vars/mbr.yml
@@ -138,6 +138,8 @@ nis_groups:
     group_id: 1410
   - name: rias-berlin-finanzen-personal
     group_id: 1420
+  - name: rias-bund
+    group_id: 1430
   - name: bgn
     group_id: 1500
   - name: bgn-finanzen-personal
@@ -171,6 +173,8 @@ nis_user:
       - vdk
       - rias
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn
       - bgn-finanzen-personal
       - regishut
@@ -197,6 +201,8 @@ nis_user:
       - vdk
       - rias
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn
       - bgn-finanzen-personal
       - regishut
@@ -217,6 +223,8 @@ nis_user:
       - vdk
       - rias
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn
       - bgn-finanzen-personal
       - regishut
@@ -274,6 +282,7 @@ nis_user:
       - rias
       - rias-finanzen-personal
       - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn
       - bgn-finanzen-personal
       - buero-scan
@@ -295,6 +304,8 @@ nis_user:
       - vdk
       - rias
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - buero-scan
       - technik
     is_samba_user: true
@@ -319,6 +330,7 @@ nis_user:
       - rias
       - rias-finanzen-personal
       - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn
       - bgn-finanzen-personal
       - regishut
@@ -342,6 +354,10 @@ nis_user:
       - all-users
       - mbr-buero
       - mbr-finanzen
+      - rias
+      - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - vdk
       - buero-scan
     is_samba_user: true
@@ -363,8 +379,10 @@ nis_user:
       - mbr-personal
       - mbr-finanzen
       - vdk
+      - rias
       - rias-finanzen-personal
       - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn-finanzen-personal
       - regishut
       - regishut-personal-finanzen
@@ -381,6 +399,8 @@ nis_user:
       - mbr-finanzen
       - vdk
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn-finanzen-personal
       - regishut
       - regishut-personal-finanzen
@@ -512,7 +532,10 @@ nis_user:
       - mbr-buero
       - mbr-finanzen
       - vdk
+      - rias
       - rias-finanzen-personal
+      - rias-berlin-finanzen-personal
+      - rias-bund
       - bgn-finanzen-personal
       - regishut
       - regishut-personal-finanzen
@@ -563,6 +586,15 @@ nis_user:
     is_samba_user: true
     password: '-a2%3bTzkW.A'
 
+  - name: julius.gruber
+    groups:
+      - all-users
+      - mbr-buero
+      - buero-scan
+      - rias
+    is_samba_user: true
+    password: 'uY-SbLux-4a9'
+
   - name: katharina.zachrau
     groups:
       - all-users
@@ -1024,6 +1056,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - lavinia.schwedersky
@@ -1133,6 +1166,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - lavinia.schwedersky
@@ -1198,6 +1232,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - laura.berner
@@ -1302,6 +1337,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - lavinia.schwedersky
@@ -1348,6 +1384,25 @@ samba_shares:
       - julia.kopp
       - ruth.hatlapa
 
+  - name: RIAS-Bund
+    path: /data/shares/RIAS-Bund
+    group_valid_users: rias-bund
+    group_write_list: rias-bund
+    file_create_mask: '0660'
+    dir_create_mask: '2770'
+    vfs_object_recycle: true
+    recycle_path: '@Recycle.Bin'
+    user:
+      - anne
+      - benjamin
+      - bianca
+      - birgit.erhardt
+      - chris
+      - christina.wendt
+      - isabell.wiesner
+      - swetlana.nikitenko
+      - sysadm
+
   - name: RIAS-Finanzen-Personal
     path: /data/shares/RIAS-Finanzen-Personal
     group_valid_users: rias-finanzen-personal
@@ -1471,6 +1526,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - lavinia.schwedersky
@@ -1537,6 +1593,7 @@ samba_shares:
       - johannes.radke
       - judith.heinmueller
       - julia.kopp
+      - julius.gruber
       - katharina.zachrau
       - kerstin.kuballa
       - lavinia.schwedersky