diff --git a/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml b/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
index c576dda..c45630b 100644
--- a/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/vars/metacluster.yml
@@ -1 +1,2 @@
-components:
+metacluster:
+  components:
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index 49121a4..4afe873 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -26,7 +26,7 @@ components:
           defaultReplicaCount: 1
         ingress:
           enabled: true
-          host: storage.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
+          host: storage.\{\{ vapp['metacluster.fqdn'] \}\}
         persistence:
           defaultClassReplicaCount: 1
 
@@ -39,9 +39,9 @@ components:
         expose:
           ingress:
             hosts:
-              core: registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
-        externalURL: https://registry.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
-        harborAdminPassword: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
+              core: registry.\{\{ vapp['metacluster.fqdn'] \}\}
+        externalURL: https://registry.\{\{ vapp['metacluster.fqdn'] \}\}
+        harborAdminPassword: "\{\{ vapp['guestinfo.rootpw'] \}\}"
         notary:
           enabled: false
 
@@ -54,14 +54,14 @@ components:
         gitea:
           admin:
             username: administrator
-            password: "{{ '{{' }} vapp['guestinfo.rootpw'] {{ '}}' }}"
-            email: admin@{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
+            password: "\{\{ vapp['guestinfo.rootpw'] \}\}"
+            email: admin@\{\{ vapp['metacluster.fqdn'] \}\}
         image:
           pullPolicy: IfNotPresent
         ingress:
           enabled: true
           hosts:
-            - host: git.{{ '{{' }} vapp['metacluster.fqdn'] {{ '}}' }}
+            - host: git.\{\{ vapp['metacluster.fqdn'] \}\}
               paths:
                 - path: /
                   pathType: Prefix