diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
index 9413b05381..fffda57f20 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2
@@ -22,8 +22,10 @@
 {% for host in groups[openshift_cluster_masters_group] %}
 {% if hostvars[host].datacenter == 'iad2' %}
 {{ host }} openshift_node_group_name='node-config-master'
+{% endif %}
 {% endfor %}
 {% for host in groups[openshift_cluster_nodes_group] %}
+{% if hostvars[host].datacenter == 'iad2' %}
 {{ host }} openshift_node_group_name='node-config-compute'
 {% endif %}
 {% endfor %}
diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2
index 0a8ae32590..17ed846761 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-prod.j2
@@ -22,8 +22,10 @@
 {% for host in groups[openshift_cluster_masters_group] %}
 {% if hostvars[host].datacenter == 'phx2' %}
 {{ host }} openshift_node_group_name='node-config-master'
+{% endif %}
 {% endfor %}
 {% for host in groups[openshift_cluster_nodes_group] %}
+{% if hostvars[host].datacenter == 'phx2' %}
 {{ host }} openshift_node_group_name='node-config-compute'
 {% endif %}
 {% endfor %}