diff --git a/manifests/swh_base.pp b/manifests/swh_base.pp
index e795d81..2b6d7bb 100644
--- a/manifests/swh_base.pp
+++ b/manifests/swh_base.pp
@@ -1,10 +1,12 @@
 class role::swh_base {
   include profile::base
   include profile::ssh::server
   include profile::unbound
   include profile::systemd_journal
   include profile::resolv_conf
   include profile::munin::node
+  include profile::icinga2::agent
+
 
   include profile::swh
 }
diff --git a/manifests/swh_eventlog.pp b/manifests/swh_eventlog.pp
index 40b0d4a..8b5e436 100644
--- a/manifests/swh_eventlog.pp
+++ b/manifests/swh_eventlog.pp
@@ -1,8 +1,6 @@
 class role::swh_eventlog inherits role::swh_server {
   include profile::puppet::agent
 
-  include profile::icinga2::agent
-
   include profile::kafka::server
   include profile::swh::deploy::storage_listener
 }