diff --git a/providers/openstack/kamaji/1-30/cluster-class/templates/cluster-class.yaml b/providers/openstack/kamaji/1-30/cluster-class/templates/cluster-class.yaml
index 4e0cecda..e45d7d73 100644
--- a/providers/openstack/kamaji/1-30/cluster-class/templates/cluster-class.yaml
+++ b/providers/openstack/kamaji/1-30/cluster-class/templates/cluster-class.yaml
@@ -70,8 +70,8 @@ spec:
     schema:
       openAPIV3Schema:
         type: string
-        default: "SCS-2V-4-20"
-        example: "SCS-2V-4-20"
+        default: "SCS-2V-4"
+        example: "SCS-2V-4"
         description: "OpenStack instance flavor for worker nodes."
   - name: worker_root_disk
     required: false
@@ -79,8 +79,8 @@ spec:
       openAPIV3Schema:
         type: integer
         minimum: 1
-        example: 20
-        description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used also for the diskless flavors."
+        example: 25
+        description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used also for the diskless flavors. Typical capi images require at least 20GB."
   - name: node_cidr
     required: false
     schema:
diff --git a/providers/openstack/kamaji/1-30/cluster-class/values.yaml b/providers/openstack/kamaji/1-30/cluster-class/values.yaml
index 525ee99c..cc6ea780 100644
--- a/providers/openstack/kamaji/1-30/cluster-class/values.yaml
+++ b/providers/openstack/kamaji/1-30/cluster-class/values.yaml
@@ -3,7 +3,7 @@ external_id: ebfe5546-f09f-4f42-ab54-094e457d42ec
 dns_nameservers:
 - 5.1.66.255
 - 185.150.99.255
-worker_flavor: SCS-2V-4-20
+worker_flavor: SCS-2V-4
 node_cidr: 10.8.0.0/20
 
 identityRef:
diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml
index d1650e66..32c4dc6d 100644
--- a/providers/openstack/scs/cluster-class/values.yaml
+++ b/providers/openstack/scs/cluster-class/values.yaml
@@ -1,5 +1,5 @@
 # mirrored from variables.tf
-controller_flavor: SCS-2V-4-20
+controller_flavor: SCS-2V-4-20s
 worker_flavor: SCS-2V-4-20
 restrict_kubeapi: []