diff --git a/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org
index 55677fc783..4a13599b48 100644
--- a/inventory/host_vars/db01.phx2.fedoraproject.org
+++ b/inventory/host_vars/db01.phx2.fedoraproject.org
@@ -29,11 +29,13 @@ databases:
 - mirrormanager
 - notifications
 - nuancier_lite
+- odcs
 - pdc
 - pkgdb2
 - statscache
 - summershum
 - tahrir
+- waiverdb
 
 # This is a more strict list of databases to backup every day
 dbs_to_backup:
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 8bb63fab56..32d6cc9f10 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -101,7 +101,7 @@ define service {
 define service {
   hostgroup_name        proxies
   service_description   http-waiverdb
-  check_command         check_website_ssl!waiverdb-web-waiverdb.app.os.fedoraproject.org!/api/v1.0/waivers/!first
+  check_command         check_website_ssl!waiverdb-web-waiverdb.app.os.fedoraproject.org!/api/v1.0/waivers!first
   max_check_attempts    8
   use                   websitetemplate
 }
@@ -109,7 +109,7 @@ define service {
 define service {
   hostgroup_name        proxies
   service_description   http-greenwave
-  check_command         check_website_ssl!greenwave-web-greenwave.app.os.fedoraproject.org!/api/v1.0/policies/!bodhi_update_push_stable
+  check_command         check_website_ssl!greenwave-web-greenwave.app.os.fedoraproject.org!/api/v1.0/policies!bodhi_update_push_stable
   max_check_attempts    8
   use                   websitetemplate
 }