diff --git a/manifests/swh_api.pp b/manifests/swh_api.pp
index 307e179..d11ea77 100644
--- a/manifests/swh_api.pp
+++ b/manifests/swh_api.pp
@@ -1,9 +1,4 @@
-class role::swh_api {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
-
+class role::swh_api inherits role::swh_server {
   include profile::munin::plugins::rabbitmq
   include profile::worker::deploy_key
 }
diff --git a/manifests/swh_database.pp b/manifests/swh_database.pp
index b102bde..2e5fefe 100644
--- a/manifests/swh_database.pp
+++ b/manifests/swh_database.pp
@@ -1,7 +1,3 @@
-class role::swh_database {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
+class role::swh_database inherits role::swh_server {
   include profile::munin::plugins::postgresql
 }
diff --git a/manifests/swh_forge.pp b/manifests/swh_forge.pp
index da0ab19..7db1b35 100644
--- a/manifests/swh_forge.pp
+++ b/manifests/swh_forge.pp
@@ -1,10 +1,5 @@
-class role::swh_forge {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
-
+class role::swh_forge inherits role::swh_server {
   include profile::network
 
   include profile::phabricator
 }
diff --git a/manifests/swh_hypervisor.pp b/manifests/swh_hypervisor.pp
index 6f14841..4c60d5a 100644
--- a/manifests/swh_hypervisor.pp
+++ b/manifests/swh_hypervisor.pp
@@ -1,7 +1,3 @@
-class role::swh_hypervisor {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
+class role::swh_hypervisor inherits role::swh_server {
   include profile::dar::server
 }
diff --git a/manifests/swh_storage.pp b/manifests/swh_storage.pp
index 43927fc..d040e6c 100644
--- a/manifests/swh_storage.pp
+++ b/manifests/swh_storage.pp
@@ -1,6 +1,2 @@
-class role::swh_storage {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
+class role::swh_storage inherits role::swh_server {
 }
diff --git a/manifests/swh_sysadmin.pp b/manifests/swh_sysadmin.pp
index 060ad17..ea03dd7 100644
--- a/manifests/swh_sysadmin.pp
+++ b/manifests/swh_sysadmin.pp
@@ -1,11 +1,7 @@
-class role::swh_sysadmin {
-  include profile::base
-  include profile::ssh::server
-  include profile::munin::node
-  include profile::dar::client
+class role::swh_sysadmin inherits role::swh_server {
   include profile::munin::master
   include profile::puppet::master
   include profile::apache::simple_server
   include profile::bind_server
   include profile::munin::plugins::postgresql
 }