diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
index 3106ca5bd0..719a873c05 100644
--- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
+++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
@@ -188,7 +188,7 @@ openshift_crio_systemcontainer_image_override="registry.access.redhat.com/opensh
 # OSBS Specific Auth
 {% if openshift_auth_profile == "osbs" %}
 openshift_master_manage_htpasswd=false
-openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '{{ openshift_htpasswd_file }}'}]
+openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider'}]
 {% endif %}
 
 {% if openshift_auth_profile == "fedoraidp" %}
@@ -851,10 +851,10 @@ openshift_node_env_vars={"ENABLE_HTTP2": "true"}
 {{ host }} openshift_node_labels="{'region':'infra'}"
 {% endfor %}
 {% for host in groups[openshift_cluster_masters_group] %}
-{{ host }}
+{{ host }} openshift_node_group_name='node-config-master'
 {% endfor %}
 {% for host in groups[openshift_cluster_nodes_group] %}
-{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}"
+{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', 'node-role.kubernetes.io/compute': 'true'}" openshift_node_group_name='node-config-compute'
 {% endfor %}
 
 {% endif %}