diff --git a/roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2
index d6e9774a85..d14b4c1a41 100644
--- a/roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2
+++ b/roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2
@@ -1 +1,11 @@
+{% if ansible_distribution_major_version|int = 7 and ansible_distribution is "RedHat" %}
 command[check_fedmsg_gateway_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway' -u fedmsg
+{% elif ansible_distribution_major_version|int < 30 and ansible_distribution is "Fedora" %}
+command[check_fedmsg_gateway_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway' -u fedmsg
+{% elif ansible_distribution_major_version|int = 8 and ansible_distribution is "RedHat" %}
+command[check_fedmsg_gateway_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway-3' -u fedmsg
+{% elif ansible_distribution_major_version|int >= 30 and ansible_distribution is "Fedora" %}
+command[check_fedmsg_gateway_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway-3' -u fedmsg
+{% else %}
+command[check_fedmsg_gateway_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway' -u fedmsg
+{% endif %}