diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 81c1c58..66b5d6a 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -51,23 +51,23 @@
       loop:
         # This list is based on `clusterctl config repositories`
         # Note: Each manifest also needs a metadata.yaml file stored in the respective folder
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/bootstrap-components.yaml
-          dest: bootstrap-kubeadm/{{ components.cluster-api.manifest.version.base }}/bootstrap-components.yaml
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/core-components.yaml
-          dest: cluster-api/{{ components.cluster-api.manifest.version.base }}/core-components.yaml
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/control-plane-components.yaml
-          dest: control-plane-kubeadm/{{ components.cluster-api.manifest.version.base }}/control-plane-components.yaml
-        - url: cluster-api-provider-vsphere/releases/{{ components.cluster-api.manifest.version.infrastructure-vsphere }}/download/infrastructure-components.yaml
-          dest: infrastructure-vsphere/{{ components.cluster-api.manifest.version.infrastructure-vsphere }}/infrastructure-components.yaml
-        - url: cluster-api-provider-vsphere/releases/{{ components.cluster-api.manifest.version.infrastructure-vsphere }}/download/metadata.yaml
-          dest: infrastructure-vsphere/{{ components.cluster-api.manifest.version.infrastructure-vsphere }}/metadata.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/bootstrap-components.yaml
+          dest: bootstrap-kubeadm/{{ components.clusterapi.manifest.version.base }}/bootstrap-components.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/core-components.yaml
+          dest: cluster-api/{{ components.clusterapi.manifest.version.base }}/core-components.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/control-plane-components.yaml
+          dest: control-plane-kubeadm/{{ components.clusterapi.manifest.version.base }}/control-plane-components.yaml
+        - url: cluster-api-provider-vsphere/releases/{{ components.clusterapi.manifest.version.infrastructure_vsphere }}/download/infrastructure-components.yaml
+          dest: infrastructure-vsphere/{{ components.clusterapi.manifest.version.infrastructure_vsphere }}/infrastructure-components.yaml
+        - url: cluster-api-provider-vsphere/releases/{{ components.clusterapi.manifest.version.infrastructure_vsphere }}/download/metadata.yaml
+          dest: infrastructure-vsphere/{{ components.clusterapi.manifest.version.infrastructure_vsphere }}/metadata.yaml
         # This downloads the same metadata.yaml file to three separate folders
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/metadata.yaml
-          dest: bootstrap-kubeadm/{{ components.cluster-api.manifest.version.base }}/metadata.yaml
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/metadata.yaml
-          dest: cluster-api/{{ components.cluster-api.manifest.version.base }}/metadata.yaml
-        - url: cluster-api/releases/{{ components.cluster-api.manifest.version.base }}/download/metadata.yaml
-          dest: control-plane-kubeadm/{{ components.cluster-api.manifest.version.base }}/metadata.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/metadata.yaml
+          dest: bootstrap-kubeadm/{{ components.clusterapi.manifest.version.base }}/metadata.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/metadata.yaml
+          dest: cluster-api/{{ components.clusterapi.manifest.version.base }}/metadata.yaml
+        - url: cluster-api/releases/{{ components.clusterapi.manifest.version.base }}/download/metadata.yaml
+          dest: control-plane-kubeadm/{{ components.clusterapi.manifest.version.base }}/metadata.yaml
       loop_control:
         label: "{{ item.url | basename }}"
 
@@ -86,19 +86,19 @@
     #   ansible.builtin.set_fact:
     #     clusterapi_containerimages: "{{ parsedmanifests | json_query('results[*].stdout') }}"
 
-    # - name: Configure clusterctl
-    #   ansible.builtin.template:
-    #     src: clusterctl.j2
-    #     dest: /opt/metacluster/manifests/clusterctl.yaml
-    #   vars:
-    #     _template:
-    #       hv:
-    #         username:
-    #         password:
-    #         fqdn:
-    #       version:
-    #         base:
-    #         infrastructure_vsphere:
+    - name: Configure clusterctl
+      ansible.builtin.template:
+        src: clusterctl.j2
+        dest: /opt/metacluster/manifests/clusterctl.yaml
+      vars:
+        _template:
+          hv:
+            fqdn: vapp['hv.fqdn']
+            username: vapp['hv.username']
+            password: vapp['hv.password']
+          version:
+            base: components.clusterapi.manifest.version.base
+            infrastructure_vsphere: components.clusterapi.manifest.version.infrastructure_vsphere
 
 - name: Parse helm charts for container images
   ansible.builtin.shell: