diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index 7c1a9c1e..cfc02a68 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -1037,7 +1037,7 @@ nubusProvisioning:
         imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     persistence:
       size: {{ .Values.persistence.storages.nubusProvisioningNats.size }}
-      storageClass: {{ coalesce .Values.persistence.storages.nubusProvisioningNats.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+      storageClassName: {{ coalesce .Values.persistence.storages.nubusProvisioningNats.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
     reloader:
       image:
         registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.nubusNatsReloader.registry | quote }}
@@ -1153,7 +1153,7 @@ nubusUdmListener:
       tag: {{ .Values.images.nubusWaitForDependency.tag }}
   persistence:
     size: {{ .Values.persistence.storages.nubusUdmListener.size | quote }}
-#    storageClass: -- coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote --
+    storageClass: {{ coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
   podAnnotations:
     {{ .Values.annotations.nubusUdmListener.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUdmListener }}
diff --git a/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl b/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
index a511ed3c..fdd1c107 100644
--- a/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl
@@ -65,7 +65,7 @@ resourcesWaitForDependency:
 
 persistence:
   size: {{ .Values.persistence.storages.oxConnector.size | quote }}
-  #storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
   {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
diff --git a/helmfile/environments/default/persistence.yaml.gotmpl b/helmfile/environments/default/persistence.yaml.gotmpl
index 4cf3fb2f..45e369ba 100644
--- a/helmfile/environments/default/persistence.yaml.gotmpl
+++ b/helmfile/environments/default/persistence.yaml.gotmpl
@@ -36,17 +36,11 @@ persistence:
     nubusProvisioningNats:
       size: "1Gi"
       storageClassName: ~
-    # This option was introduced with openDesk 1.6. For now we want to use the Helm charts default empty string
-    # to avoid issues during the upgrade modifying an existing PV, as the migrations in 1.6 required a smooth
-    # Nubus deployment.
-    # In a later openDesk release we will advise in the migrations.md to explicitly set this on existing deployments
-    # to the default storage class.
     nubusUdmListener:
       size: "1Gi"
-      #storageClassName: ""
+      storageClassName: ~
     oxConnector:
       size: "1Gi"
-      # This value is not passed on to the related Helm chart yet, but required for linting purposes.
       storageClassName: ~
     postfix:
       size: "1Gi"