diff --git a/manifests/icinga2/plugins/rabbitmq.pp b/manifests/icinga2/plugins/rabbitmq.pp
index 79bcbbc..b883dc9 100644
--- a/manifests/icinga2/plugins/rabbitmq.pp
+++ b/manifests/icinga2/plugins/rabbitmq.pp
@@ -1,81 +1,89 @@
 # RabbitMQ icinga2 plugins
 
 class profile::icinga2::plugins::rabbitmq {
-  $packages = ['nagios-plugins-rabbitmq']
+  $packages = ['nagios-plugins-rabbitmq', 'libjson-perl']
   package {$packages:
     ensure => present,
   }
 
   $plugin_configfile = '/etc/icinga2/conf.d/rabbitmq-plugins.conf'
 
   $base_arguments = {
-    '-H' => '$rabbitmq_host$',
-    '-P' => '$rabbitmq_port$',
-    '-u' => '$rabbitmq_user$',
-    '-p' => '$rabbitmq_password$',
+    '-H'         => '$rabbitmq_host$',
+    '--port'     => '$rabbitmq_port$',
+    '--user'     => '$rabbitmq_user$',
+    '--password' => '$rabbitmq_password$',
+    '--vhost' => {
+      'value'  => '$rabbitmq_vhost$',
+      'set_if' => '$rabbitmq_vhost$',
+    }
   }
 
   $base_vars = {
     'rabbitmq_host'     => '$check_address$',
     'rabbitmq_port'     => '15672',
     'rabbitmq_user'     => 'guest',
     'rabbitmq_password' => 'guest',
   }
 
   $plugins = {
     rabbitmq_shovels => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_partition => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_connections => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_aliveness => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_cluster => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_watermark => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_server => {
-      arguments => $base_arguments,
-      vars      => $base_vars,
+      arguments => $base_arguments + {
+        '--node' => '$rabbitmq_node$',
+      },
+      vars      => $base_vars + {
+        'rabbitmq_node' => '$check_address$',
+      },
     },
     rabbitmq_exchange => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_objects => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_overview => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
     rabbitmq_queue => {
       arguments => $base_arguments,
       vars      => $base_vars,
     },
   }
 
   $plugins.each |$command, $plugin| {
     ::icinga2::object::checkcommand {$command:
       import    => ['plugin-check-command'],
       command   => ["-:PluginContribDir + \"-rabbitmq/check_${command}\""],
       arguments => $plugin['arguments'],
       vars      => $plugin['vars'],
       target    => $plugin_configfile,
     }
   }
 }