diff --git a/ansible/roles/assets/tasks/manifests.yml b/ansible/roles/assets/tasks/manifests.yml
index adf2094..0fa58b4 100644
--- a/ansible/roles/assets/tasks/manifests.yml
+++ b/ansible/roles/assets/tasks/manifests.yml
@@ -2,19 +2,27 @@
 
     - name: Aggregate chart_values into dict
       ansible.builtin.set_fact:
-        chart_values: "{{ chart_values | default({}) | combine({ (item.key | regex_replace('[^A-Za-z0-9]', '')): { 'chart_values': (item.value.helm.chart_values | from_yaml) } }) }}"
+        metacluster_chartvalues: "{{ metacluster_chartvalues | default({}) | combine({ (item.key | regex_replace('[^A-Za-z0-9]', '')): { 'chart_values': (item.value.helm.chart_values | from_yaml) } }) }}"
       when: item.value.helm.chart_values is defined
       loop: "{{ lookup('ansible.builtin.dict', components) }}"
       loop_control:
         label: "{{ item.key }}"
 
+    # - name: Aggregate chart_values into dict
+    #   ansible.builtin.set_fact:
+    #     workloadcluster_chartvalues: "{{ workloadcluster_chartvalues | default({}) | combine({ (item.key | regex_replace('[^A-Za-z0-9]', '')): { 'chart_values': (item.value.chart_values | from_yaml) } }) }}"
+    #   when: item.value.chart_values is defined
+    #   loop: "{{ lookup('ansible.builtin.dict', downstream.helm_charts) }}"
+    #   loop_control:
+    #     label: "{{ item.key }}"
+
     - name: Write dict to vars_file
       ansible.builtin.copy:
         dest: /opt/firstboot/ansible/vars/metacluster.yml
         content: >-
           {{
             { 'components': (
-              chart_values |
+              metacluster_chartvalues |
               combine({ 'clusterapi': components.clusterapi }) |
               combine({ 'kubevip'   : components.kubevip }) )
             } | to_nice_yaml(indent=2, width=4096)
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/gitops.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/gitops.yml
index 7355580..77147a0 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/gitops.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/gitops.yml
@@ -1,10 +1,17 @@
+- name: Aggregate helm charts from filesystem
+  ansible.builtin.find:
+    path: /opt/workloadcluster/helm-charts
+    file_type: directory
+    recurse: false
+  register: helm_charts
+
 - name: Create hard-links to populate new git-repository
   ansible.builtin.shell:
     cmd: >-
-      cp -lr /opt/metacluster/helm-charts/{{ item.key }}/ /opt/workloadcluster/git-repositories/gitops/
-  loop: "{{ lookup('ansible.builtin.dict', downstream.helm_charts) }}"
+      cp -lr {{ item.path }}/ /opt/workloadcluster/git-repositories/gitops/
+  loop: "{{ helm_charts.files }}"
   loop_control:
-    label: "{{ item.key }}"
+    label: "{{ item.path | basename }}"
 
 - name: Initialize/Push git repository
   ansible.builtin.shell:
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
index c002cb5..783ef2c 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
@@ -38,7 +38,7 @@
           community.vmware.vmware_guest_disk:
             name: "{{ ova_deploy.instance.hw_name }}"
             disk:
-              - size: 1Gb
+              - size: 1Mb
                 scsi_controller: 1
                 scsi_type: paravirtual
                 unit_number: 0