diff --git a/manifests/disable_autofs.pp b/manifests/disable_autofs.pp
new file mode 100644
index 0000000000000000000000000000000000000000..cbb6b6b3c2208efa75ce35df49b5153a1f6b09ef
--- /dev/null
+++ b/manifests/disable_autofs.pp
@@ -0,0 +1,9 @@
+class analysator::disable_autofs {
+  # Disable autofs if installed
+  exec { '/bin/systemctl disable autofs.service':
+    onlyif => '/bin/systemctl is-enabled autofs',
+  }
+  exec { '/bin/systemctl stop autofs.service':
+    onlyif => '/bin/systemctl is-active autofs',
+  }
+}
diff --git a/manifests/login.pp b/manifests/login.pp
index e73e0605ed91c25add224538770415767ea1943e..16e5190f0178f446cc9f665d554fd231704516b3 100644
--- a/manifests/login.pp
+++ b/manifests/login.pp
@@ -1,5 +1,6 @@
 class analysator::login {
   include analysator::packages::build_node
+  include ::analysator::disable_autofs
 
   $eth_iface='eno2'
   network::interface { $eth_iface:
diff --git a/manifests/node.pp b/manifests/node.pp
index 971eedc74f768725ccea3da86b0ac7dd4ba0b00e..4a94df1859d320f3969dfb0f39fe03d3d4a15800 100644
--- a/manifests/node.pp
+++ b/manifests/node.pp
@@ -27,6 +27,7 @@ class analysator::node (
   include ::analysator::common
   require ::analysator::slurm
   include ::analysator::munge
+  include ::analysator::disable_autofs
 
   if(!$login) {
     service { 'slurmd':
diff --git a/manifests/packages.pp b/manifests/packages.pp
index 9833a202a506c8f77d1188624df5c71b43421f2d..105210f2b6b5fffa00d25d8b3cd473274163a90f 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -27,13 +27,6 @@ class analysator::packages::compute_node
     ]:
       ensure => installed,
   }
-
-  package {
-    [
-      'autofs',  # auto.home will override the ceph /home mount
-    ]:
-      ensure => purged,
-  }
 }
 
 # Packages needed for building, but not needed when running