diff --git a/site-modules/role/manifests/swh_base.pp b/site-modules/role/manifests/swh_base.pp
index 9f0a1dbe..3ade0ce5 100644
--- a/site-modules/role/manifests/swh_base.pp
+++ b/site-modules/role/manifests/swh_base.pp
@@ -1,13 +1,14 @@
 class role::swh_base {
   include profile::base
   include profile::ssh::server
   include profile::unbound
   include profile::systemd_journal
   include profile::resolv_conf
   include profile::munin::node
+  include profile::prometheus::node
   include profile::icinga2
   include profile::rsyslog
 
 
   include profile::swh
 }
diff --git a/site-modules/role/manifests/swh_ceph.pp b/site-modules/role/manifests/swh_ceph.pp
index e0728e13..2a9c2a76 100644
--- a/site-modules/role/manifests/swh_ceph.pp
+++ b/site-modules/role/manifests/swh_ceph.pp
@@ -1,4 +1,3 @@
 class role::swh_ceph inherits role::swh_base {
   include profile::puppet::agent
-  include profile::prometheus::node
 }
diff --git a/site-modules/role/manifests/swh_ci.pp b/site-modules/role/manifests/swh_ci.pp
index 79702fa5..516aaedf 100644
--- a/site-modules/role/manifests/swh_ci.pp
+++ b/site-modules/role/manifests/swh_ci.pp
@@ -1,5 +1,4 @@
 # doesn't inherit swh_server to avoid backups by default
 class role::swh_ci inherits role::swh_base {
   include profile::puppet::agent
-  include profile::prometheus::node
 }
diff --git a/site-modules/role/manifests/swh_database.pp b/site-modules/role/manifests/swh_database.pp
index 7cc2079f..4d9945ab 100644
--- a/site-modules/role/manifests/swh_database.pp
+++ b/site-modules/role/manifests/swh_database.pp
@@ -1,9 +1,8 @@
 class role::swh_database inherits role::swh_server {
   include profile::puppet::agent
 
-  include profile::prometheus::node
   include profile::prometheus::sql
 
   include profile::munin::plugins::postgresql
   include profile::postgresql
 }
diff --git a/site-modules/role/manifests/swh_sysadmin.pp b/site-modules/role/manifests/swh_sysadmin.pp
index 9d5c8fd4..f214bc4c 100644
--- a/site-modules/role/manifests/swh_sysadmin.pp
+++ b/site-modules/role/manifests/swh_sysadmin.pp
@@ -1,24 +1,23 @@
 class role::swh_sysadmin inherits role::swh_server {
   include profile::network
 
   include profile::munin::master
   include profile::munin::stats_export
 
   include profile::prometheus::server
   include profile::grafana
 
-  include profile::prometheus::node
   include profile::prometheus::sql
 
   include profile::puppet::master
 
   include profile::icinga2::icingaweb2
 
   include profile::apache::simple_server
   include profile::bind_server
   include profile::munin::plugins::postgresql
 
   include profile::annex_web
   include profile::docs_web
   include profile::debian_repository
 }