diff --git a/host_vars/file-fhxb.fhxb.netz.yml b/host_vars/file-fhxb.fhxb.netz.yml
index 9e35013..a6aa2fb 100644
--- a/host_vars/file-fhxb.fhxb.netz.yml
+++ b/host_vars/file-fhxb.fhxb.netz.yml
@@ -708,9 +708,10 @@ samba_user:
       - fhxb-sammlungen
     password: 'n7I.fSsR-9vv'
 
-
 base_home: /home
 
+samba_homes_virusfilter: true
+
 # remove_samba_users:
 #   - name: name1
 #   - name: name2
@@ -728,6 +729,7 @@ samba_shares:
     group_write_list: administration
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
 
   - name: Altlasten
@@ -737,6 +739,7 @@ samba_shares:
     group_write_list: altlasten
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
 
   - name: Archiv
@@ -746,6 +749,7 @@ samba_shares:
     group_write_list: archiv
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -756,6 +760,7 @@ samba_shares:
     group_write_list: ausstellungen
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -766,6 +771,7 @@ samba_shares:
     group_write_list: buero
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -776,6 +782,7 @@ samba_shares:
     group_write_list: forschung
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -786,6 +793,7 @@ samba_shares:
     group_write_list: gedenken-im-stadtraum
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -796,6 +804,7 @@ samba_shares:
     group_write_list: intern
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -806,6 +815,7 @@ samba_shares:
     group_write_list: leitung
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -816,6 +826,7 @@ samba_shares:
     group_write_list: museum-organisation
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -826,6 +837,7 @@ samba_shares:
     group_write_list: presse-orga-oeffentlichkeit
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -836,6 +848,7 @@ samba_shares:
     group_write_list: projekte
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -846,6 +859,7 @@ samba_shares:
     group_write_list: publikationen
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -856,6 +870,7 @@ samba_shares:
     group_write_list: stolpersteine
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -866,6 +881,7 @@ samba_shares:
     group_write_list: team
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -876,6 +892,7 @@ samba_shares:
     group_write_list: technik
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -886,6 +903,7 @@ samba_shares:
     group_write_list: vze
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -896,6 +914,7 @@ samba_shares:
     group_write_list: veranstaltungen
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -906,6 +925,7 @@ samba_shares:
     group_write_list: vermietung
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -916,6 +936,7 @@ samba_shares:
     group_write_list: vermittlung
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -926,6 +947,7 @@ samba_shares:
     group_write_list: fhxb-bildarchiv
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -936,6 +958,7 @@ samba_shares:
     group_write_list: fhxb-sammlungen
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
diff --git a/host_vars/file-fm.fm.netz.yml b/host_vars/file-fm.fm.netz.yml
index 9c5a6d4..073c1d9 100644
--- a/host_vars/file-fm.fm.netz.yml
+++ b/host_vars/file-fm.fm.netz.yml
@@ -473,6 +473,8 @@ samba_user:
 
 base_home: /data/home
 
+samba_homes_virusfilter: true
+
 # remove_samba_users:
 #   - name: name1
 #   - name: name2
@@ -491,6 +493,7 @@ samba_shares:
     group_write_list: buero
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -501,6 +504,7 @@ samba_shares:
     group_write_list: projekte
     file_create_mask: !!str 664
     dir_create_mask: !!str 2775
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
@@ -511,6 +515,7 @@ samba_shares:
     group_write_list: verwaltung
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
 
diff --git a/host_vars/file-km.anw-km.netz.yml b/host_vars/file-km.anw-km.netz.yml
index 2868980..72158fc 100644
--- a/host_vars/file-km.anw-km.netz.yml
+++ b/host_vars/file-km.anw-km.netz.yml
@@ -584,6 +584,8 @@ samba_user:
 
 base_home: /data/home
 
+samba_homes_virusfilter: true
+
 remove_samba_users:
   - name: howe-staff-1
   - name: gerhard
@@ -602,6 +604,7 @@ samba_shares:
     group_write_list: a-jur
     file_create_mask: !!str 664
     dir_create_mask: !!str 2775
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -613,6 +616,7 @@ samba_shares:
     group_write_list: kanzlei
     file_create_mask: !!str 664
     dir_create_mask: !!str 2775
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -624,6 +628,7 @@ samba_shares:
     group_write_list: intern
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: false
 
   - name: wildvang
@@ -633,6 +638,7 @@ samba_shares:
     group_write_list: wildvang
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -666,6 +672,7 @@ samba_shares:
     group_write_list: stahmann
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -677,6 +684,7 @@ samba_shares:
     group_write_list: traine
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -688,6 +696,7 @@ samba_shares:
     group_write_list: public
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -699,6 +708,7 @@ samba_shares:
     group_write_list: advoware
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
@@ -710,6 +720,7 @@ samba_shares:
     group_write_list: intern
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: false
@@ -721,6 +732,7 @@ samba_shares:
     group_write_list: alle
     file_create_mask: !!str 660
     dir_create_mask: !!str 2770
+    vfs_object_virusfilter: true
     vfs_object_recycle: true
     recycle_path: '@Recycle'
     vfs_object_recycle_is_visible: true
diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml
index 513ba5d..a6f38e4 100644
--- a/roles/common/tasks/users.yml
+++ b/roles/common/tasks/users.yml
@@ -55,6 +55,7 @@
   loop: "{{ default_user }}"
   loop_control:
     label: '{{ item.name }}'
+  when: item.name != ansible_user
   tags:
     - users-exists