diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/openStackClusterTemplate/_openStackClusterTemplateSpec.yaml b/charts/t8s-cluster/templates/management-cluster/clusterClass/openStackClusterTemplate/_openStackClusterTemplateSpec.yaml
index c3a55d04be..fa4caece78 100644
--- a/charts/t8s-cluster/templates/management-cluster/clusterClass/openStackClusterTemplate/_openStackClusterTemplateSpec.yaml
+++ b/charts/t8s-cluster/templates/management-cluster/clusterClass/openStackClusterTemplate/_openStackClusterTemplateSpec.yaml
@@ -4,7 +4,7 @@ Here we are generating a hash suffix.
 */}}
 {{- define "t8s-cluster.clusterClass.openStackClusterTemplate.spec" -}}
   {{- $_ := mustMerge . (pick .context "Values") -}}
-  {{- $cloud := lookup "t8s-engine.teuto.net/v1alpha1" "TeutonetesCloud" "" .Values.cloud -}}
+  {{- $cloud := lookup "t8s-engine.teuto.net/v1beta1" "TeutonetesCloud" "" .Values.cloud -}}
 apiServerLoadBalancer:
   enabled: {{ not .Values.controlPlane.hosted }}
   {{- with .Values.controlPlane.allowedCIDRs }}
diff --git a/charts/t8s-cluster/templates/workload-cluster/storageClasses.yaml b/charts/t8s-cluster/templates/workload-cluster/storageClasses.yaml
new file mode 100644
index 0000000000..d1e447a294
--- /dev/null
+++ b/charts/t8s-cluster/templates/workload-cluster/storageClasses.yaml
@@ -0,0 +1,38 @@
+{{- $cloud := lookup "t8s-engine.teuto.net/v1beta1" "TeutonetesCloud" "" .Values.cloud -}}
+
+{{- if not $cloud -}}
+  {{/* Only fail in real life, not during testing */}}
+  {{- if ne .Release.Namespace "default" -}}
+    {{- fail (printf "Cloud %s not found" .Values.cloud) -}}
+  {{- end -}}
+{{- else -}}
+  {{- $defaultClass := $cloud.spec.volumeTypes.default -}}
+
+  {{- $storageClasses := list -}}
+
+  {{- range $name, $type := $cloud.spec.volumeTypes.types }}
+    {{- $storageClasses = append $storageClasses (include "t8s-cluster.storageclass" (dict "name" $name "type" $type "default" (eq $defaultClass $name))) -}}
+  {{- end -}}
+
+  {{- include "t8s-cluster.helm.resourceIntoCluster" (dict "name" "storageclasses" "resource" ($storageClasses | join "\n---\n") "context" $ "additionalLabels" (dict "app.kubernetes.io/component" "storage")) | nindent 0 -}}
+{{- end -}}
+
+{{- define "t8s-cluster.storageclass" -}}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ printf "teutostack-%s" .name }}
+  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
+    app.kubernetes.io/component: storage
+  {{- if .default }}
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+  {{- end }}
+allowVolumeExpansion: true
+parameters:
+  availability: nova
+  type: {{ .type }}
+provisioner: cinder.csi.openstack.org
+reclaimPolicy: Delete
+volumeBindingMode: WaitForFirstConsumer
+{{- end -}}
diff --git a/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_hdd.yaml b/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_hdd.yaml
deleted file mode 100644
index 84b294b328..0000000000
--- a/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_hdd.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- include "t8s-cluster.helm.resourceIntoCluster" (dict "name" "storageclass-hdd" "resource" (include "t8s-cluster.storage.hdd" (dict)) "context" $ "additionalLabels" (dict "app.kubernetes.io/component" "storage")) | nindent 0 }}
-
-{{- define "t8s-cluster.storage.hdd" -}}
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: teutostack-hdd
-  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
-    app.kubernetes.io/component: storage
-allowVolumeExpansion: true
-parameters:
-  availability: nova
-  type: Ceph-HDD
-provisioner: cinder.csi.openstack.org
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-{{- end }}
diff --git a/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_ssd.yaml b/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_ssd.yaml
deleted file mode 100644
index e2c73327e3..0000000000
--- a/charts/t8s-cluster/templates/workload-cluster/storageclass/teutostack/teutostack_ssd.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- include "t8s-cluster.helm.resourceIntoCluster" (dict "name" "storageclass-ssd" "resource" (include "t8s-cluster.storage.ssd" (dict)) "context" $ "additionalLabels" (dict "app.kubernetes.io/component" "storage")) | nindent 0 }}
-
-{{- define "t8s-cluster.storage.ssd" -}}
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: teutostack-ssd
-  labels: {{- include "common.helm.labels" (dict) | nindent 4 }}
-    app.kubernetes.io/component: storage
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-allowVolumeExpansion: true
-parameters:
-  availability: nova
-  type: Ceph-SSD
-provisioner: cinder.csi.openstack.org
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-{{- end -}}