diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 9e2642c3d9..661a49a33f 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -148,7 +148,7 @@
   - check_mirrorlist_docker_proxy.cfg
   - check_mirrorlist_cache.cfg
   - check_celery_redis_queue.cfg
-  - check_odcs_backend_proc.cfg
+  - check_fedmsg_hub_3_proc.cfg
   - check_proxies.cfg
   notify:
   - restart nrpe
diff --git a/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2
new file mode 100644
index 0000000000..5df1b0e791
--- /dev/null
+++ b/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2
@@ -0,0 +1 @@
+command[check_fedmsg_hub_3_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u fedmsg
diff --git a/roles/nagios_client/templates/check_odcs_backend_proc.cfg.j2 b/roles/nagios_client/templates/check_odcs_backend_proc.cfg.j2
deleted file mode 100644
index 411d39bf13..0000000000
--- a/roles/nagios_client/templates/check_odcs_backend_proc.cfg.j2
+++ /dev/null
@@ -1 +0,0 @@
-command[check_odcs_backend_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'odcs-backend' -u odcs
diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index 42dbaa85a0..28b23ee212 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -150,8 +150,8 @@ define service {
 }
 define service {
   host_name             odcs-backend01.phx2.fedoraproject.org
-  service_description   Check for odcs-backend proc
-  check_command         check_by_nrpe!check_odcs_backend_proc
+  service_description   Check for fedmsg-hub-3 proc
+  check_command         check_by_nrpe!check_fedmsg_hub_3_proc
   use                   defaulttemplate
 }
 
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index 675bc6c1dc..053608a2a6 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -331,6 +331,7 @@ command[check_fedmsg_gateway_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1
 command[check_fedmsg_irc_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-irc' -u fedmsg
 command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-tweet' -u fedmsg
 command[check_fedmsg_composer_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u apache
+command[check_fedmsg_hub_3_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u fedmsg
 command[check_repospanner_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'repospanner' -u repoSpanner
 command[check_supybot_fedmsg_plugin]=/usr/lib64/nagios/plugins/check_supybot_plugin -t fedmsg
 command[check_haproxy_conns]=/usr/lib64/nagios/plugins/check_haproxy_conns.py
@@ -346,7 +347,6 @@ command[check_koschei_scheduler_proc]=/usr/lib64/nagios/plugins/check_procs -s R
 command[check_koschei_watcher_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-watcher -c 1:1
 command[check_mirrorlist_docker_proxy]=/usr/lib64/nagios/plugins/check_tcp -H localhost -p 18081
 command[check_mailman_api]=/usr/lib64/nagios/plugins/check_http -H localhost -p 8001 -u /3.0
-command[check_odcs_backend_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'odcs-bakend' -u odcs
 
 # The following are fedmsg/datanommer checks to be run on busgateway01.
 # They check for the time since the latest message in any particular category.