diff --git a/class/defaults.yml b/class/defaults.yml
index 73c29f6..a4dbef4 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -10,10 +10,10 @@ parameters:
     charts:
       openstack-cloud-controller-manager:
         source: https://kubernetes.github.io/cloud-provider-openstack
-        version: "2.35.0"
+        version: "2.36.0"
       openstack-cinder-csi:
         source: https://kubernetes.github.io/cloud-provider-openstack
-        version: "2.35.0"
+        version: "2.36.0"
 
     images:
       openstack_cloud_controller_manager:
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
index 44b8c56..c3a699f 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: system:cloud-controller-manager
 rules:
   - apiGroups:
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
index 28dd71b..d6964bc 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: system:openstack-cloud-controller-manager:auth-delegate
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
index 497f427..5d735b1 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: system:cloud-controller-manager
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
index 1135314..2695ff9 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: openstack-cloud-controller-manager
   namespace: syn-cloud-provider-openstack
 spec:
@@ -22,7 +22,7 @@ spec:
         checksum/config: b0b31d6311d187dd53758033396c83505652c1ec8a62bef0b9afe7f9572f8db4
       labels:
         app: openstack-cloud-controller-manager
-        chart: openstack-cloud-controller-manager-2.35.0
+        chart: openstack-cloud-controller-manager-2.36.0
         component: controllermanager
         heritage: Helm
         release: openstack-ccm
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/service-sm.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/service-sm.yaml
index 952f16f..8475a67 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/service-sm.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/service-sm.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: openstack-cloud-controller-manager
   namespace: syn-cloud-provider-openstack
 spec:
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
index b24ebbe..84124bb 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: cloud-controller-manager
   namespace: syn-cloud-provider-openstack
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/servicemonitor.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/servicemonitor.yaml
index 67222c8..5d2c6f1 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/servicemonitor.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/servicemonitor.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: openstack-cloud-controller-manager
   namespace: syn-cloud-provider-openstack
 spec:
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
index af0f50f..26b9fc6 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: null
   labels:
     app: openstack-cinder-csi
-    chart: openstack-cinder-csi-2.35.0
+    chart: openstack-cinder-csi-2.36.0
     component: controllerplugin
     heritage: Helm
     release: cinder-csi
@@ -27,7 +27,7 @@ spec:
       annotations: null
       labels:
         app: openstack-cinder-csi
-        chart: openstack-cinder-csi-2.35.0
+        chart: openstack-cinder-csi-2.36.0
         component: controllerplugin
         heritage: Helm
         release: cinder-csi
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-podmonitor.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-podmonitor.yaml
index bd35833..e21bc8e 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-podmonitor.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-podmonitor.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: null
   labels:
     app: openstack-cinder-csi
-    chart: openstack-cinder-csi-2.35.0
+    chart: openstack-cinder-csi-2.36.0
     component: controllerplugin
     heritage: Helm
     release: cinder-csi
diff --git a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
index a6c6d55..c5572e2 100644
--- a/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
+++ b/tests/golden/cloud-config/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: null
   labels:
     app: openstack-cinder-csi
-    chart: openstack-cinder-csi-2.35.0
+    chart: openstack-cinder-csi-2.36.0
     component: nodeplugin
     heritage: Helm
     release: cinder-csi
@@ -21,7 +21,7 @@ spec:
       annotations: null
       labels:
         app: openstack-cinder-csi
-        chart: openstack-cinder-csi-2.35.0
+        chart: openstack-cinder-csi-2.36.0
         component: nodeplugin
         heritage: Helm
         release: cinder-csi
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
index 44b8c56..c3a699f 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrole.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: system:cloud-controller-manager
 rules:
   - apiGroups:
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
index 497f427..5d735b1 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/clusterrolebinding.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: system:cloud-controller-manager
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
index 36a7572..78e9388 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/daemonset.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: openstack-cloud-controller-manager
   namespace: syn-cloud-provider-openstack
 spec:
@@ -22,7 +22,7 @@ spec:
         checksum/config: b0b31d6311d187dd53758033396c83505652c1ec8a62bef0b9afe7f9572f8db4
       labels:
         app: openstack-cloud-controller-manager
-        chart: openstack-cloud-controller-manager-2.35.0
+        chart: openstack-cloud-controller-manager-2.36.0
         component: controllermanager
         heritage: Helm
         release: openstack-ccm
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
index b24ebbe..84124bb 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/10_ccm_helm_chart/openstack-cloud-controller-manager/templates/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: openstack-ccm
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: openstack-cloud-controller-manager
-    app.kubernetes.io/version: v1.35.0
-    helm.sh/chart: openstack-cloud-controller-manager-2.35.0
+    app.kubernetes.io/version: v1.36.0
+    helm.sh/chart: openstack-cloud-controller-manager-2.36.0
   name: cloud-controller-manager
   namespace: syn-cloud-provider-openstack
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
index 254d950..4e48ba7 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/controllerplugin-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: null
   labels:
     app: openstack-cinder-csi
-    chart: openstack-cinder-csi-2.35.0
+    chart: openstack-cinder-csi-2.36.0
     component: controllerplugin
     heritage: Helm
     release: cinder-csi
@@ -27,7 +27,7 @@ spec:
       annotations: null
       labels:
         app: openstack-cinder-csi
-        chart: openstack-cinder-csi-2.35.0
+        chart: openstack-cinder-csi-2.36.0
         component: controllerplugin
         heritage: Helm
         release: cinder-csi
diff --git a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
index a6c6d55..c5572e2 100644
--- a/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
+++ b/tests/golden/defaults/cloud-provider-openstack/cloud-provider-openstack/20_csi_helm_chart/openstack-cinder-csi/templates/nodeplugin-daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations: null
   labels:
     app: openstack-cinder-csi
-    chart: openstack-cinder-csi-2.35.0
+    chart: openstack-cinder-csi-2.36.0
     component: nodeplugin
     heritage: Helm
     release: cinder-csi
@@ -21,7 +21,7 @@ spec:
       annotations: null
       labels:
         app: openstack-cinder-csi
-        chart: openstack-cinder-csi-2.35.0
+        chart: openstack-cinder-csi-2.36.0
         component: nodeplugin
         heritage: Helm
         release: cinder-csi