diff --git a/manifests/icinga2/objects.pp b/manifests/icinga2/objects.pp
index ef19947..070e5c9 100644
--- a/manifests/icinga2/objects.pp
+++ b/manifests/icinga2/objects.pp
@@ -1,13 +1,16 @@
 # Icinga2 object definitions
 class profile::icinga2::objects {
   include profile::icinga2::objects::templates
   include profile::icinga2::objects::commands
   include profile::icinga2::objects::users
   include profile::icinga2::objects::notifications
   include profile::icinga2::objects::timeperiods
 
   include profile::icinga2::objects::common_checks
   include profile::icinga2::objects::static_checks
   include profile::icinga2::objects::agent_checks
   include profile::icinga2::objects::exported_checks
+
+  include profile::icinga2::plugins::rabbitmq
+
 }
diff --git a/manifests/rabbitmq.pp b/manifests/rabbitmq.pp
index 641828b..195eb48 100644
--- a/manifests/rabbitmq.pp
+++ b/manifests/rabbitmq.pp
@@ -1,37 +1,34 @@
 class profile::rabbitmq {
   include ::profile::munin::plugins::rabbitmq
-  include ::profile::icinga2::plugins::rabbitmq
 
   $rabbitmq_user = hiera('rabbitmq::monitoring::user')
   $rabbitmq_password = hiera('rabbitmq::monitoring::password')
 
   package {'rabbitmq-server':
     ensure => installed
   }
 
   service {'rabbitmq-server':
     ensure  => 'running',
     enable  => true,
     require => Package['rabbitmq-server'],
   }
 
   $icinga_checks_file = '/etc/icinga2/conf.d/exported-checks.conf'
 
   @@::icinga2::object::service {"rabbitmq-server on ${::fqdn}":
-    service_name     => 'rabbitmq server',
-    import           => ['generic-service'],
-    host_name        => $::fqdn,
-    check_command    => 'rabbitmq_server',
-    command_endpoint => $::fqdn,
-    vars             => {
-      rabbitmq_address  => '127.0.0.1',
+    service_name  => 'rabbitmq server',
+    import        => ['generic-service'],
+    host_name     => $::fqdn,
+    check_command => 'rabbitmq_server',
+    vars          => {
       rabbitmq_port     => 15672,
       rabbitmq_vhost    => '/',
       rabbitmq_node     => $::hostname,
       rabbitmq_user     => $rabbitmq_user,
       rabbitmq_password => $rabbitmq_password,
     },
-    target           => $icinga_checks_file,
-    tag              => 'icinga2::exported',
+    target        => $icinga_checks_file,
+    tag           => 'icinga2::exported',
   }
 }