diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
index 70e6e0b..75830cb 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
@@ -104,8 +104,8 @@
     clustersize: >-
       {{ {
         'controlplane': vapp['deployment.type'] | regex_findall('^cp(\d)+') | first,
-        'worker': vapp['deployment.type'] | regex_findall('w(\d)+$') | first,
-        'workerstorage': vapp['deployment.type'] | regex_findall('ws(\d)+') | first
+        'worker': vapp['deployment.type'] | regex_findall('w(\d)+') | first,
+        'workerstorage': vapp['deployment.type'] | regex_findall('ws(\d)+$') | first
       } }}
 
 - name: Generate workload cluster manifest
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2 b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2
index 9cd2a33..8a1dd95 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2
@@ -27,6 +27,17 @@ patchesStrategicMerge:
           mounts:
           - - LABEL=blockstorage
             - /mnt/blockstorage
+  - |-
+    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+    kind: VSphereMachineTemplate
+    metadata:
+      name: {{ _template.cluster.name }}-worker
+      namespace: default
+    spec:
+      template:
+        spec:
+          additionalDisksGiB:
+          - {{ _template.nodepool.additionaldisk }}
 
 patchesJson6902:
   - target:
@@ -67,8 +78,3 @@ patchesJson6902:
       - op: replace
         path: /metadata/name
         value: {{ _template.cluster.name }}-worker-storage
-      - op: add
-        path: /spec/template/spec
-        value:
-          additionalDisksGiB:
-          - {{ _template.nodepool.additionaldisk }}
diff --git a/scripts/Update-OvfConfiguration.bootstrap.yml b/scripts/Update-OvfConfiguration.bootstrap.yml
index 9514fe5..12f068c 100644
--- a/scripts/Update-OvfConfiguration.bootstrap.yml
+++ b/scripts/Update-OvfConfiguration.bootstrap.yml
@@ -6,7 +6,7 @@ DeploymentConfigurations:
 
 - Id: cp1w1ws1
   Label: 'Workload-cluster: 1 control-plane node/1 worker node/1 worker-storage node'
-  Description: 1 control-plane node/2 worker nodes
+  Description: 1 control-plane node/1 worker node/1 worker-storage node
 
 - Id: core
   Label: No workload-cluster