diff --git a/ansible/roles/firstboot/files/ansible_payload/playbook.yml b/ansible/roles/firstboot/files/ansible_payload/playbook.yml
index 5f0614a..e1abad3 100644
--- a/ansible/roles/firstboot/files/ansible_payload/playbook.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/playbook.yml
@@ -20,5 +20,5 @@
         src: "{{ item }}"
         state: present
         kubeconfig: "{{ kubeconfig.path }}"
-      with_fileglob: /var/lib/rancher/k3s/server/manifests/*.yaml
+      loop: "{{ query('ansible.builtin.fileglob', '/var/lib/rancher/k3s/server/manifests/*.yaml') | sort }}"
       ignore_errors: yes
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
index fd23b57..4ccad4c 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
@@ -2,4 +2,4 @@
   ansible.builtin.command:
     cmd: k3s ctr image import {{ item }}
     chdir: /opt/metacluster/container-images
-  with_fileglob: /opt/metacluster/container-images/*.tar
+  loop: "{{ query('ansible.builtin.fileglob', '/opt/metacluster/container-images/*.tar') | sort }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/certauthority.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/certauthority.yml
index 00e5dc0..c207c37 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/certauthority.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/certauthority.yml
@@ -35,15 +35,18 @@
     _template:
       name: "{{ item.name }}"
       namespace: "{{ item.namespace }}"
-      labels: "{{ item.labels | default({}) | indent(width=4, indent=True) }}"
+      labels: "{{ item.labels | default('{}') | indent(width=4, first=True) }}"
       data: "{{ item.data }}"
   loop:
     - name: argocd-tls-certs-cm
       namespace: argo-cd
       kind: configmap
       labels: |
+        app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: argocd-cm
         app.kubernetes.io/part-of: argocd
+        meta.helm.sh/release-name: argo-cd
+        meta.helm.sh/release-namespace: argo-cd
       data:
       - key: git.{{ vapp['metacluster.fqdn'] }}
         value: "{{ stepca_cm_certs.resources[0].data['root_ca.crt'] }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/init.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/init.yml
index ff0be03..b8bded8 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/init.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/init.yml
@@ -1,4 +1,4 @@
-- name: Create component entries in /etc/hosts
+- name: Configure fallback name resolution
   ansible.builtin.lineinfile:
     path: /etc/hosts
     line: "{{ vapp['guestinfo.ipaddress'] }}  {{ item + '.' + vapp['metacluster.fqdn'] }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
index cafd4b4..9d7a0d4 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
@@ -22,7 +22,7 @@
             docker-archive:./{{ item | basename }} | \
           jq -r '.Tags[0]')
     chdir: /opt/metacluster/container-images/
-  with_fileglob: /opt/metacluster/container-images/*.tar
+  loop: "{{ query('ansible.builtin.fileglob', '/opt/metacluster/container-images/*.tar') | sort }}"
   loop_control:
     label: "{{ item | basename }}"
 
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/secrets.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/secrets.yml
index c26edb8..391dce8 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/secrets.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/secrets.yml
@@ -5,7 +5,7 @@
     release_namespace: kube-system
     wait: yes
     kubeconfig: "{{ kubeconfig.path }}"
-    values: "{{ components.sealedsecrets.chart_values }}"
+    # values: "{{ components.sealedsecrets.chart_values }}"
 
 - name: Store hypervisor details in secret
   kubernetes.core.k8s:
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml
index 4cf5b41..3596366 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/main.yml
@@ -54,7 +54,7 @@
       community.vmware.vmware_guest_info:
         name: "{{ (item | basename | split('.'))[:-1] | join('.') }}"
       register: existing_ova
-      with_fileglob: /opt/workloadcluster/node-templates/*.ova
+      loop: "{{ query('ansible.builtin.fileglob', '/opt/workloadcluster/node-templates/*.ova') | sort }}"
       ignore_errors: yes
 
     - name: Parse OVA files for network mappings
@@ -67,7 +67,7 @@
         GOVC_PASSWORD: "{{ vapp['hv.password'] }}"
       register: ova_spec
       when: existing_ova.results[index] is failed
-      with_fileglob: /opt/workloadcluster/node-templates/*.ova
+      loop: "{{ query('ansible.builtin.fileglob', '/opt/workloadcluster/node-templates/*.ova') | sort }}"
       loop_control:
         index_var: index
 
@@ -83,7 +83,7 @@
         ovf: "{{ item }}"
       register: ova_deploy
       when: existing_ova.results[index] is failed
-      with_fileglob: /opt/workloadcluster/node-templates/*.ova
+      loop: "{{ query('ansible.builtin.fileglob', '/opt/workloadcluster/node-templates/*.ova') | sort }}"
       loop_control:
         index_var: index
 
diff --git a/ansible/roles/firstboot/files/ansible_payload/templates/configmap.j2 b/ansible/roles/firstboot/files/ansible_payload/templates/configmap.j2
index 3926bdd..26ad2c0 100644
--- a/ansible/roles/firstboot/files/ansible_payload/templates/configmap.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/templates/configmap.j2
@@ -7,5 +7,5 @@ metadata:
 {{ _template.labels }}
 data:
 {% for kv_pair in _template.data %}
-  "{{ kv_pair.key }}": {{ kv_pair.value }}
+  "{{ kv_pair.key }}": "{{ kv_pair.value }}"
 {% endfor %}