diff --git a/manifests/icinga2/master.pp b/manifests/icinga2/agent.pp
similarity index 56%
copy from manifests/icinga2/master.pp
copy to manifests/icinga2/agent.pp
index 5e1242a..7ef8651 100644
--- a/manifests/icinga2/master.pp
+++ b/manifests/icinga2/agent.pp
@@ -1,26 +1,25 @@
-# An icinga master host
-class profile::icinga2::master {
-  $zonename = hiera('icinga2::zonename')
+# Icinga2 agent configuration
+class profile::icinga2::agent {
   $zones = hiera('icinga2::zones')
   $endpoints = hiera('icinga2::endpoints')
+  $accept_config = hiera('icinga2::accept_config')
+  $features = hiera('icinga2::features')
 
   include profile::icinga2::apt_config
 
   class {'::icinga2':
-    confd     => false,
-    features  => ['checker', 'mainlog', 'notification', 'statusdata', 'compatlog', 'command'],
-    constants => {
-      'ZoneName' => $zonename,
-    },
+    confd    => false,
+    features => $features,
   }
 
   class { 'icinga2::feature::api':
+    accept_config   => $accept_config,
     accept_commands => true,
     endpoints       => $endpoints,
     zones           => $zones,
   }
 
   icinga2::object::zone { 'global-templates':
     global => true,
   }
 }
diff --git a/manifests/icinga2/master.pp b/manifests/icinga2/master.pp
index 5e1242a..bbb9dce 100644
--- a/manifests/icinga2/master.pp
+++ b/manifests/icinga2/master.pp
@@ -1,26 +1,29 @@
 # An icinga master host
 class profile::icinga2::master {
   $zonename = hiera('icinga2::zonename')
   $zones = hiera('icinga2::zones')
   $endpoints = hiera('icinga2::endpoints')
+  $features = hiera('icinga2::features')
+  $accept_config = hiera('icinga2::accept_config')
 
   include profile::icinga2::apt_config
 
   class {'::icinga2':
     confd     => false,
-    features  => ['checker', 'mainlog', 'notification', 'statusdata', 'compatlog', 'command'],
+    features  => $features,
     constants => {
       'ZoneName' => $zonename,
     },
   }
 
   class { 'icinga2::feature::api':
+    accept_config   => $accept_config,
     accept_commands => true,
     endpoints       => $endpoints,
     zones           => $zones,
   }
 
   icinga2::object::zone { 'global-templates':
     global => true,
   }
 }