diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 7482da8..af5b803 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -37,18 +37,9 @@
         dest: /opt/firstboot/ansible/vars/metacluster.yml
         content: "{{ { 'components': chart_values } | to_nice_yaml(indent=2, width=4096) }}"
 
-- name: Parse helm charts for container images
-  ansible.builtin.shell:
-    cmd: "{{ item.value.helm.parse_logic }}"
-    chdir: /opt/metacluster/helm-charts/{{ item.key }}
-  register: containerimages
-  loop: "{{ lookup('ansible.builtin.dict', components) }}"
-  loop_control:
-    label: "{{ item.key }}"
-
 - block:
 
-    - name: Retrieve Cluster-API manifests
+    - name: Lookup ClusterAPI manifests
       ansible.builtin.shell:
         cmd: clusterctl config repositories | awk '/CoreProvider|kubeadm|vsphere/ {print $(NF-1)"download/"$NF}'
       register: clusterapi_manifests
@@ -70,15 +61,18 @@
       loop_control:
         label: "{{ item | basename }}"
 
-    - debug:
-        var: parsedmanifests
-
     - name: Store container images
       ansible.builtin.set_fact:
-        clusterapi_containerimages: "{{ parsedmanifests.results | json_query('results[*].stdout') }}"
+        clusterapi_containerimages: "{{ parsedmanifests | json_query('results[*].stdout') }}"
 
-    - debug:
-        var: clusterapi_containerimages
+- name: Parse helm charts for container images
+  ansible.builtin.shell:
+    cmd: "{{ item.value.helm.parse_logic }}"
+    chdir: /opt/metacluster/helm-charts/{{ item.key }}
+  register: containerimages
+  loop: "{{ lookup('ansible.builtin.dict', components) }}"
+  loop_control:
+    label: "{{ item.key }}"
 
 - name: Pull and store containerimages
   ansible.builtin.shell: