diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index c44f05c79e..32d99866a1 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -241,6 +241,7 @@
     group: root
     mode: 0600
   with_items:
+  - check_rabbitmq_server.cfg
   - rabbitmq_args.cfg
   when: inventory_hostname.startswith('rabbitmq')
   notify:
diff --git a/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
new file mode 100644
index 0000000000..94b4e461b9
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
@@ -0,0 +1 @@
+command[check_nrpe_check_rabbitmq_server]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_server --extra-opts=common@/etc/nrpe.d/rabbitmq_args.cfg
\ No newline at end of file
diff --git a/roles/nagios_server/files/nagios/services/rabbitmq.cfg b/roles/nagios_server/files/nagios/services/rabbitmq.cfg
index e5d553cb9e..0d33701728 100644
--- a/roles/nagios_server/files/nagios/services/rabbitmq.cfg
+++ b/roles/nagios_server/files/nagios/services/rabbitmq.cfg
@@ -1,6 +1,6 @@
 define service {
   host_name             rabbitmq01.phx2.fedoraproject.org
   service_description   Check bus server processes
-  check_command         check_by_nrpe!check_nrpe_check_rabbitmq_server!common@/etc/nrpe.d/rabbitmq_args.cfg
+  check_command         check_by_nrpe!check_nrpe_check_rabbitmq_server
   use                   defaulttemplate
 }
\ No newline at end of file