diff --git a/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
index 94b4e461b9..501c0c03e3 100644
--- a/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
+++ b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
@@ -1 +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
+command[check_nrpe_check_rabbitmq_server]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_server --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini
\ No newline at end of file
diff --git a/roles/nagios_client/templates/rabbitmq_args.ini.j2 b/roles/nagios_client/templates/rabbitmq_args.ini.j2
index ee3078d701..6f3f79c3e7 100644
--- a/roles/nagios_client/templates/rabbitmq_args.ini.j2
+++ b/roles/nagios_client/templates/rabbitmq_args.ini.j2
@@ -1,4 +1,5 @@
 [common]
 hostname = localhost
 username = nagios-monitoring
-password = {{ (env == 'production')|ternary(rabbitmq_monitoring_password_production, rabbitmq_monitoring_password_staging) }}
\ No newline at end of file
+password = {{ (env == 'production')|ternary(rabbitmq_monitoring_password_production, rabbitmq_monitoring_password_staging) }}
+node = {{ inventory_hostname }}
\ No newline at end of file