diff --git a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2
index 4ab8fa1d76..bfc872cc55 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/pgbdr.cfg.j2
@@ -1,9 +1,9 @@
-define hostgroup {
-        hostgroup_name  pgbdr
-        alias           PGBDR servers
-        members         {% for host in groups['pgbdr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+# define hostgroup {
+#         hostgroup_name  pgbdr
+#         alias           PGBDR servers
+#         members         {% for host in groups['pgbdr'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
 
-}
+# }
 
 define hostgroup {
         hostgroup_name  pgbdr-stg
diff --git a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
index 541f1cd0f2..774cf160e9 100644
--- a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
@@ -1,5 +1,5 @@
 {% for host in groups['all'] %}
-{% if hostvars[host].datacenter == 'cloud' %}
+{% if hostvars[host].datacenter == 'cloud' || hostvars[host].datacenter == 'fedorainfracloud' %}
 define host {
    use                     defaulttemplate
    host_name               {{ host }}