diff --git a/maintenance.yml b/maintenance.yml
index 7da9736ab16a6b7c8e161f86b127ddb0760d6861..d31c3e9424ac47cf8428cdff47fd98949994b0c8 100644
--- a/maintenance.yml
+++ b/maintenance.yml
@@ -1,5 +1,5 @@
 - hosts: 'ComputeNodes,DGXRHELNodes'
-  gather_facts: smart # not sure if false is clever here
+  gather_facts: false # not sure if false is clever here
   tasks:
   - include_vars: vars/ldapConfig.yml
   - include_vars: vars/filesystems.yml
@@ -102,17 +102,16 @@
   tasks:
   - { name: disable_lustre_service, service: name=lustre-client enabled=no, tags: [never,disable_lustre_service] }
 
+- hosts: 'ComputeNodes,LoginNodes,DGXRHELNodes,ManagementNodes'
+  gather_facts: false
+  tasks:
+  - { name: umount /home, mount: path=/home state=unmounted, become: true, become_user: root, tags: [never,umount_home] }
 
-#- hosts: 'ComputeNodes,LoginNodes,DGXRHELNodes'
-#  gather_facts: false
-#  tasks:
-#  - name: Mount up device by UUID
-#  mount:
-#    path: /home
-#    src: UUID=b3e48f45-f933-4c8e-a700-22a159ec9077
-#    fstype: xfs
-#    opts: noatime
-#    state: present
+#this should not really end up in the main branch but it does not hurt if it will
+- hosts: 'ComputeNodes,LoginNodes,DGXRHELNodes,ManagementNodes'
+  gather_facts: false
+  tasks:
+  - { name: umount local-legacy, mount: path=/usr/local-legacy state=absent, become: true, become_user: root, tags: [never,umount_locallegacy] }
 
 #!/bin/sh
 #