diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index f1d3274..6e4892f 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -85,7 +85,10 @@
 
     - name: Store container images
       ansible.builtin.set_fact:
-        clusterapi_containerimages: "{{ parsedmanifests | json_query('results[*].stdout') | select() }}"
+        clusterapi_containerimages: "{{ parsedmanifests | json_query('results[*].stdout_lines') | select() | flatten }}"
+
+    - debug:
+        var: clusterapi_containerimages
 
     - name: Configure clusterctl
       ansible.builtin.template:
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index cef0ebb..4011fca 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -79,7 +79,9 @@ components:
   clusterapi:
     manifest:
       version:
+        # Must match the version referenced at `dependencies.static_binaries[.filename==clusterctl].url`
         base: v1.2.4
+        # Must match the version referenced at `components.cert-manager.helm.version`
         cert_manager: v1.9.1
         infrastructure_vsphere: v1.3.5