diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/main.yml
index b0f2266..59d5fa3 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/main.yml
@@ -1,5 +1,11 @@
 - import_tasks: hypervisor.yml
 - import_tasks: registry.yml
 - import_tasks: nodetemplates.yml
-- import_tasks: clusterapi.yml
-- import_tasks: gitops.yml
+
+- block:
+
+    - import_tasks: clusterapi.yml
+    - import_tasks: gitops.yml
+
+  when:
+    - vapp['deployment.type'] != 'core'
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 8354cac..4357da2 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
@@ -42,6 +42,11 @@
         disk:
           - size: 1Gb
             unit_number: 1
+      when: ova_deploy.results[index] is not skipped
+      loop: "{{ ova_deploy.results }}"
+      loop_control:
+        index_var: index
+        label: "{{ item.item }}"
 
     # Disabled to allow disks to be resized; at the cost of cloning speed
     # - name: Create snapshot on deployed VM's
diff --git a/scripts/Update-OvfConfiguration.bootstrap.yml b/scripts/Update-OvfConfiguration.bootstrap.yml
index 34e6bb0..4b74c10 100644
--- a/scripts/Update-OvfConfiguration.bootstrap.yml
+++ b/scripts/Update-OvfConfiguration.bootstrap.yml
@@ -6,9 +6,11 @@ DeploymentConfigurations:
 
 - Id: cp1w2
   Label: 'Workload-cluster: 1 control-plane node/2 worker nodes'
-  Description: |
-    1 control-plane node
-    2 worker nodes
+  Description: 1 control-plane node/2 worker nodes
+
+- Id: core
+  Label: No workload-cluster
+  Description: Only the metacluster is deployed (useful for recovery scenario's)
 
 DynamicDisks:
 
@@ -28,6 +30,7 @@ PropertyCategories:
     Value:
     - cp1w1
     - cp1w2
+    - core
     UserConfigurable: false
 
 - Name: 1) Meta-cluster
@@ -124,7 +127,9 @@ PropertyCategories:
     Label: Workload-cluster name*
     Description: ''
     DefaultValue: 'workload-{{ hostname.suffix }}'
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
   - Key: workloadcluster.vip
@@ -132,7 +137,9 @@ PropertyCategories:
     Label: Workload-cluster virtual IP address*
     Description: Workload-cluster control plane endpoint virtual IP address
     DefaultValue: ''
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
   - Key: ippool.startip
@@ -140,7 +147,9 @@ PropertyCategories:
     Label: Workload-cluster IP-pool start IP address*
     Description: All nodes for the workload-cluster will be provisioned within this IP pool
     DefaultValue: ''
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
   - Key: ippool.endip
@@ -148,7 +157,9 @@ PropertyCategories:
     Label: Workload-cluster IP-pool end IP address*
     Description: All nodes for the workload-cluster will be provisioned within this IP pool
     DefaultValue: ''
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
   - Key: workloadcluster.nodesize
@@ -159,7 +170,9 @@ PropertyCategories:
       - SMALL: 2 vCPU/6GB RAM
       - MEDIUM: 4 vCPU/8GB RAM
     DefaultValue: 'small'
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
   - Key: workloadcluster.additionaldisk
@@ -167,7 +180,9 @@ PropertyCategories:
     Label: Workload-cluster block storage disk size*
     Description: 'All worker-nodes for the workload-cluster will be provisioned with an additional disk of the specified size'
     DefaultValue: '20'
-    Configurations: '*'
+    Configurations:
+      - cp1w1
+      - cp1w2
     UserConfigurable: true
 
 - Name: 4) Common