diff --git a/manifests/swh_base.pp b/manifests/swh_base.pp
index bae58d5c..bcd1bbe1 100644
--- a/manifests/swh_base.pp
+++ b/manifests/swh_base.pp
@@ -1,7 +1,8 @@
 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_worker.pp b/manifests/swh_worker.pp
index 2ff2092e..47a13f98 100644
--- a/manifests/swh_worker.pp
+++ b/manifests/swh_worker.pp
@@ -1,5 +1,4 @@
 class role::swh_worker inherits role::swh_base {
   include profile::network
-  include profile::puppet::agent
   include profile::swh::deploy::storage
 }