diff --git a/manifests/swh_api.pp b/manifests/swh_api.pp
index 2f4317f2..3af29b83 100644
--- a/manifests/swh_api.pp
+++ b/manifests/swh_api.pp
@@ -1,6 +1,5 @@
 class role::swh_api inherits role::swh_server {
   include profile::network
 
   include profile::munin::plugins::rabbitmq
-  include profile::worker::deploy_key
 }
diff --git a/manifests/swh_base.pp b/manifests/swh_base.pp
index 727e7adf..bae58d5c 100644
--- a/manifests/swh_base.pp
+++ b/manifests/swh_base.pp
@@ -1,5 +1,7 @@
 class role::swh_base {
   include profile::base
   include profile::ssh::server
   include profile::munin::node
+
+  include profile::swh
 }
diff --git a/manifests/swh_worker.pp b/manifests/swh_worker.pp
index 0061a8b1..6b99f9e2 100644
--- a/manifests/swh_worker.pp
+++ b/manifests/swh_worker.pp
@@ -1,6 +1,4 @@
 class role::swh_worker inherits role::swh_base {
   include profile::network
   include profile::puppet::agent
-
-  include profile::worker::deploy_key
 }