diff --git a/class/defaults.yml b/class/defaults.yml
index 73c29f6..7437df7 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -23,7 +23,7 @@ parameters:
       cinder_csi_plugin:
         registry: registry.k8s.io
         repository: provider-os/cinder-csi-plugin
-        tag: v1.35.0
+        tag: v1.36.0
 
     cloud_config_secret_name: cloud-config
 
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..a8cbd01 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
@@ -144,7 +144,7 @@ spec:
               value: /etc/config/cloud.conf
             - name: CLUSTER_NAME
               value: c-green-test-1234
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.35.0
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.36.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 5
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..3da68f1 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
@@ -77,7 +77,7 @@ spec:
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/config/cloud.conf
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.35.0
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.36.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 5
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..e672799 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
@@ -143,7 +143,7 @@ spec:
               value: /etc/config/cloud.conf
             - name: CLUSTER_NAME
               value: c-green-test-1234
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.35.0
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.36.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 5
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..3da68f1 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
@@ -77,7 +77,7 @@ spec:
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/config/cloud.conf
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.35.0
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.36.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 5