diff --git a/manifests/swh_api.pp b/manifests/swh_api.pp
index 595198c..0bff939 100644
--- a/manifests/swh_api.pp
+++ b/manifests/swh_api.pp
@@ -1,4 +1,5 @@
 class role::swh_api {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_database.pp b/manifests/swh_database.pp
index 7492fb6..4eb9ab9 100644
--- a/manifests/swh_database.pp
+++ b/manifests/swh_database.pp
@@ -1,4 +1,5 @@
 class role::swh_database {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_forge.pp b/manifests/swh_forge.pp
index 58ce640..9e17a97 100644
--- a/manifests/swh_forge.pp
+++ b/manifests/swh_forge.pp
@@ -1,4 +1,5 @@
 class role::swh_forge {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_hypervisor.pp b/manifests/swh_hypervisor.pp
index 76546a1..c40a305 100644
--- a/manifests/swh_hypervisor.pp
+++ b/manifests/swh_hypervisor.pp
@@ -1,4 +1,5 @@
 class role::swh_hypervisor {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_server.pp b/manifests/swh_server.pp
index 59d8aa3..3dd6f1d 100644
--- a/manifests/swh_server.pp
+++ b/manifests/swh_server.pp
@@ -1,4 +1,5 @@
 class role::swh_server {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_storage.pp b/manifests/swh_storage.pp
index d8433c1..cb4aeb0 100644
--- a/manifests/swh_storage.pp
+++ b/manifests/swh_storage.pp
@@ -1,4 +1,5 @@
 class role::swh_storage {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
 }
diff --git a/manifests/swh_sysadmin.pp b/manifests/swh_sysadmin.pp
index 1f9b40b..9b629aa 100644
--- a/manifests/swh_sysadmin.pp
+++ b/manifests/swh_sysadmin.pp
@@ -1,4 +1,6 @@
 class role::swh_sysadmin {
   include profile::base
   include profile::ssh::server
+  include profile::munin::node
+  include profile::munin::master
 }
diff --git a/manifests/swh_worker.pp b/manifests/swh_worker.pp
index de0bd5a..4b43cbf 100644
--- a/manifests/swh_worker.pp
+++ b/manifests/swh_worker.pp
@@ -1,5 +1,6 @@
 class role::swh_worker {
   include profile::base
   include profile::ssh::server
   include profile::network
+  include profile::munin::node
 }