diff --git a/manifests/swh_server.pp b/manifests/swh_base.pp
similarity index 61%
copy from manifests/swh_server.pp
copy to manifests/swh_base.pp
index a340ced..727e7ad 100644
--- a/manifests/swh_server.pp
+++ b/manifests/swh_base.pp
@@ -1,6 +1,5 @@
-class role::swh_server {
+class role::swh_base {
   include profile::base
   include profile::ssh::server
   include profile::munin::node
-  include profile::dar::client
 }
diff --git a/manifests/swh_server.pp b/manifests/swh_server.pp
index a340ced..a92c3bb 100644
--- a/manifests/swh_server.pp
+++ b/manifests/swh_server.pp
@@ -1,6 +1,3 @@
-class role::swh_server {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
+class role::swh_server inherits role::swh_base {
   include profile::dar::client
 }
diff --git a/manifests/swh_worker.pp b/manifests/swh_worker.pp
index 5395db2..0061a8b 100644
--- a/manifests/swh_worker.pp
+++ b/manifests/swh_worker.pp
@@ -1,9 +1,6 @@
-class role::swh_worker {
-  include profile::base
-  include profile::ssh::server
+class role::swh_worker inherits role::swh_base {
   include profile::network
-  include profile::munin::node
   include profile::puppet::agent
 
   include profile::worker::deploy_key
 }