diff --git a/manifests/swh_api.pp b/manifests/swh_api.pp
index c6f789aa..2e20a5c0 100644
--- a/manifests/swh_api.pp
+++ b/manifests/swh_api.pp
@@ -1,7 +1,8 @@
 class role::swh_api inherits role::swh_server {
   include profile::network
+  include profile::puppet::agent
 
   include profile::munin::plugins::rabbitmq
   include profile::swh::deploy::storage
   include profile::swh::deploy::webapp
 }
diff --git a/manifests/swh_backup.pp b/manifests/swh_backup.pp
index 287894ab..33d644c6 100644
--- a/manifests/swh_backup.pp
+++ b/manifests/swh_backup.pp
@@ -1,2 +1,3 @@
 class role::swh_backup inherits role::swh_server {
+  include profile::puppet::agent
 }
diff --git a/manifests/swh_base.pp b/manifests/swh_base.pp
index bcd1bbe1..bae58d5c 100644
--- a/manifests/swh_base.pp
+++ b/manifests/swh_base.pp
@@ -1,8 +1,7 @@
 class role::swh_base {
   include profile::base
   include profile::ssh::server
   include profile::munin::node
-  include profile::puppet::agent
 
   include profile::swh
 }
diff --git a/manifests/swh_database.pp b/manifests/swh_database.pp
index 2e5fefe6..45942beb 100644
--- a/manifests/swh_database.pp
+++ b/manifests/swh_database.pp
@@ -1,3 +1,4 @@
 class role::swh_database inherits role::swh_server {
+  include profile::puppet::agent
   include profile::munin::plugins::postgresql
 }
diff --git a/manifests/swh_desktop.pp b/manifests/swh_desktop.pp
index abcd4091..916c64aa 100644
--- a/manifests/swh_desktop.pp
+++ b/manifests/swh_desktop.pp
@@ -1,4 +1,5 @@
 class role::swh_desktop inherits role::swh_base {
+  include profile::puppet::agent
   include profile::desktop
   include profile::devel
 }
diff --git a/manifests/swh_forge.pp b/manifests/swh_forge.pp
index a45bb382..462bf2c6 100644
--- a/manifests/swh_forge.pp
+++ b/manifests/swh_forge.pp
@@ -1,6 +1,7 @@
 class role::swh_forge inherits role::swh_server {
   include profile::network
+  include profile::puppet::agent
 
   include profile::phabricator
   include profile::mediawiki
 }
diff --git a/manifests/swh_hypervisor.pp b/manifests/swh_hypervisor.pp
index 4c60d5a3..2d548226 100644
--- a/manifests/swh_hypervisor.pp
+++ b/manifests/swh_hypervisor.pp
@@ -1,3 +1,4 @@
 class role::swh_hypervisor inherits role::swh_server {
   include profile::dar::server
+  include profile::puppet::agent
 }
diff --git a/manifests/swh_storage.pp b/manifests/swh_storage.pp
index 10530939..a42db0f3 100644
--- a/manifests/swh_storage.pp
+++ b/manifests/swh_storage.pp
@@ -1,3 +1,4 @@
 class role::swh_storage inherits role::swh_server {
+  include profile::puppet::agent
   include profile::swh::deploy::storage
 }
diff --git a/manifests/swh_sysadmin.pp b/manifests/swh_sysadmin.pp
index e52e2175..e607fde5 100644
--- a/manifests/swh_sysadmin.pp
+++ b/manifests/swh_sysadmin.pp
@@ -1,9 +1,10 @@
 class role::swh_sysadmin inherits role::swh_server {
   include profile::network
 
   include profile::munin::master
+  #include profile::puppet::agent
   #include profile::puppet::master
   include profile::apache::simple_server
   include profile::bind_server
   include profile::munin::plugins::postgresql
 }
diff --git a/manifests/swh_worker.pp b/manifests/swh_worker.pp
index 47a13f98..2ff2092e 100644
--- a/manifests/swh_worker.pp
+++ b/manifests/swh_worker.pp
@@ -1,4 +1,5 @@
 class role::swh_worker inherits role::swh_base {
   include profile::network
+  include profile::puppet::agent
   include profile::swh::deploy::storage
 }