diff --git a/10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2 b/10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2
index 4f79440..186e44d 100644
--- a/10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2
+++ b/10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1alpha1
 kind: AgentConfig
 metadata:
-  name: {{ group_vars['hub-cluster'].cluster_name }}
+  name: {{ hostvars['ocp-hub'].cluster_name }}
 rendezvousIP: {{ hostvars['ocp-hub'].ip_address }}
 bootArtifactsBaseURL: https://matchbox.int.mk-labs.cloud:8080/assets/hub/
 hosts:
diff --git a/10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2 b/10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2
index 7b47116..2d590d3 100644
--- a/10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2
+++ b/10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2
@@ -1,25 +1,25 @@
 apiVersion: v1
-baseDomain: {{ group_vars['hub-cluster'].base_domain }}
+baseDomain: {{ hostvars['ocp-hub'].base_domain }}
 compute:
 - name: worker
-  replicas: {{ group_vars['hub-cluster'].worker_node_count }}
+  replicas: {{ hostvars['ocp-hub'].worker_node_count }}
 controlPlane:
   hyperthreading: Enabled
   name: master
-  replicas: {{ master_node_count }}
+  replicas: {{ hostvars['ocp-hub'].master_node_count }}
 metadata:
-  name: {{ group_vars['hub-cluster'].cluster_name }}
+  name: {{ hostvars['ocp-hub'].cluster_name }}
 networking:
   clusterNetwork:
-  - cidr: {{ group_vars['hub-cluster'].cluster_network }}
-    hostPrefix: {{ group_vars['hub-cluster'].cluster_network_host_prefix }}
+  - cidr: {{ hostvars['ocp-hub'].cluster_network }}
+    hostPrefix: {{ hostvars['ocp-hub'].cluster_network_host_prefix }}
   machineNetwork:
-  - cidr: {{ group_vars['hub-cluster'].machine_network }}
+  - cidr: {{ hostvars['ocp-hub'].machine_network }}
   networkType: OVNKubernetes
   serviceNetwork:
-  - {{ group_vars['hub-cluster'].service_network }}
+  - {{ hostvars['ocp-hub'].service_network }}
 platform:
-  {{ group_vars['hub-cluster'].platform_type }}: {}
+  {{ hostvars['ocp-hub'].platform_type }}: {}
 fips: false
 pullSecret: {{ vault_pull_secret }}
 sshKey: {{ vault_ssh_key }}