diff --git a/data/hostname/rancher-node-production-mgmt1.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-mgmt1.internal.softwareheritage.org.yaml
index 30183e63..47714902 100644
--- a/data/hostname/rancher-node-production-mgmt1.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-mgmt1.internal.softwareheritage.org.yaml
@@ -1,4 +1,14 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
+  - 192.168.200.22
+
+# override the default values
+mountpoints:
+  /tmp:
+    ensure: absent
+  swap:
+    ensure: absent
+  /srv/storage/space:
+    ensure: absent
diff --git a/data/hostname/rancher-node-production-worker01.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-worker01.internal.softwareheritage.org.yaml
index 82a9979c..125ef288 100644
--- a/data/hostname/rancher-node-production-worker01.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-worker01.internal.softwareheritage.org.yaml
@@ -1,8 +1,13 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
   - 192.168.200.22
 
 icinga2::host::vars:
   load: high
+
+# override the default values
+mountpoints:
+  /srv/storage/space:
+    ensure: absent
diff --git a/data/hostname/rancher-node-production-worker02.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-worker02.internal.softwareheritage.org.yaml
index 82a9979c..125ef288 100644
--- a/data/hostname/rancher-node-production-worker02.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-worker02.internal.softwareheritage.org.yaml
@@ -1,8 +1,13 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
   - 192.168.200.22
 
 icinga2::host::vars:
   load: high
+
+# override the default values
+mountpoints:
+  /srv/storage/space:
+    ensure: absent
diff --git a/data/hostname/rancher-node-production-worker03.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-worker03.internal.softwareheritage.org.yaml
index 82a9979c..125ef288 100644
--- a/data/hostname/rancher-node-production-worker03.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-worker03.internal.softwareheritage.org.yaml
@@ -1,8 +1,13 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
   - 192.168.200.22
 
 icinga2::host::vars:
   load: high
+
+# override the default values
+mountpoints:
+  /srv/storage/space:
+    ensure: absent
diff --git a/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml
index 82a9979c..125ef288 100644
--- a/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml
@@ -1,8 +1,13 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
   - 192.168.200.22
 
 icinga2::host::vars:
   load: high
+
+# override the default values
+mountpoints:
+  /srv/storage/space:
+    ensure: absent
diff --git a/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml b/data/hostname/rancher-node-production-worker05.internal.softwareheritage.org.yaml
similarity index 66%
copy from data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml
copy to data/hostname/rancher-node-production-worker05.internal.softwareheritage.org.yaml
index 82a9979c..125ef288 100644
--- a/data/hostname/rancher-node-production-worker04.internal.softwareheritage.org.yaml
+++ b/data/hostname/rancher-node-production-worker05.internal.softwareheritage.org.yaml
@@ -1,8 +1,13 @@
 # local cache is not compatible with rancher in docker
 dns::local_cache: false
 dns::nameservers:
   - 192.168.100.29
   - 192.168.200.22
 
 icinga2::host::vars:
   load: high
+
+# override the default values
+mountpoints:
+  /srv/storage/space:
+    ensure: absent
diff --git a/site-modules/role/manifests/rancher_node.pp b/site-modules/role/manifests/rancher_node.pp
index 241c0a89..ccb94f98 100644
--- a/site-modules/role/manifests/rancher_node.pp
+++ b/site-modules/role/manifests/rancher_node.pp
@@ -1,5 +1,6 @@
 class role::rancher_node inherits role::swh_base {
   include profile::docker
   include profile::zfs::docker
   include profile::zfs::kubelet
+  include profile::mountpoints
 }