diff --git a/infra-config/10-sno-hub-cluster/03-openshift-image/templates/agent-config.yaml.j2 b/infra-config/10-sno-hub-cluster/03-openshift-image/templates/agent-config.yaml.j2
index c5ae9bd..4171c26 100644
--- a/infra-config/10-sno-hub-cluster/03-openshift-image/templates/agent-config.yaml.j2
+++ b/infra-config/10-sno-hub-cluster/03-openshift-image/templates/agent-config.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1alpha1
 kind: AgentConfig
 metadata:
-  name: {{ hostvars[groups['hub-cluster'][0]].cluster_name }}
+  name: {{ hostvars[groups['hub_cluster'][0]].cluster_name }}
 rendezvousIP: {{ hostvars['ocp-hub'].ip_address }}
 bootArtifactsBaseURL: {{ hostvars[groups['matchbox'][0]].http_endpoint }}/assets/hub/
 hosts:
diff --git a/infra-config/10-sno-hub-cluster/03-openshift-image/templates/install-config.yaml.j2 b/infra-config/10-sno-hub-cluster/03-openshift-image/templates/install-config.yaml.j2
index 528189c..c250cce 100644
--- a/infra-config/10-sno-hub-cluster/03-openshift-image/templates/install-config.yaml.j2
+++ b/infra-config/10-sno-hub-cluster/03-openshift-image/templates/install-config.yaml.j2
@@ -1,25 +1,25 @@
 apiVersion: v1
-baseDomain: {{ hostvars[groups['hub-cluster'][0]].base_domain }}
+baseDomain: {{ hostvars[groups['hub_cluster'][0]].base_domain }}
 compute:
 - name: worker
-  replicas: {{ hostvars[groups['hub-cluster'][0]].worker_node_count }}
+  replicas: {{ hostvars[groups['hub_cluster'][0]].worker_node_count }}
 controlPlane:
   hyperthreading: Enabled
   name: master
-  replicas: {{ hostvars[groups['hub-cluster'][0]].master_node_count }}
+  replicas: {{ hostvars[groups['hub_cluster'][0]].master_node_count }}
 metadata:
-  name: {{ hostvars[groups['hub-cluster'][0]].cluster_name }}
+  name: {{ hostvars[groups['hub_cluster'][0]].cluster_name }}
 networking:
   clusterNetwork:
-  - cidr: {{ hostvars[groups['hub-cluster'][0]].cluster_network }}
-    hostPrefix: {{ hostvars[groups['hub-cluster'][0]].cluster_network_host_prefix }}
+  - cidr: {{ hostvars[groups['hub_cluster'][0]].cluster_network }}
+    hostPrefix: {{ hostvars[groups['hub_cluster'][0]].cluster_network_host_prefix }}
   machineNetwork:
-  - cidr: {{ hostvars[groups['hub-cluster'][0]].machine_network }}
+  - cidr: {{ hostvars[groups['hub_cluster'][0]].machine_network }}
   networkType: OVNKubernetes
   serviceNetwork:
-  - {{ hostvars[groups['hub-cluster'][0]].service_network }}
+  - {{ hostvars[groups['hub_cluster'][0]].service_network }}
 platform:
-  {{ hostvars[groups['hub-cluster'][0]].platform_type }}: {}
+  {{ hostvars[groups['hub_cluster'][0]].platform_type }}: {}
 fips: false
 pullSecret: '{{ vault_pull_secret }}'
 sshKey: '{{ vault_ssh_key }}'