diff --git a/class/defaults.yml b/class/defaults.yml
index 6a40605..1a9a586 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -13,7 +13,7 @@ parameters:
       cloudscale-csi-plugin:
         registry: quay.io
         repository: cloudscalech/cloudscale-csi-plugin
-        tag: v3.6.1
+        tag: v4.0.0
 
     api_token: ?{vaultkv:${cluster:tenant}/${cluster:name}/cloudscale/token}
     api_token_secret_name: cloudscale
diff --git a/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml b/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
index 7578663..3cf7617 100644
--- a/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
+++ b/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
@@ -61,7 +61,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.6.1
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.0
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
diff --git a/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml b/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
index 7ba1e45..a98419e 100644
--- a/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
+++ b/tests/golden/defaults/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
@@ -81,7 +81,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.6.1
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.0
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
diff --git a/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml b/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
index 3450541..49abf8c 100644
--- a/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
+++ b/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/daemonset.yaml
@@ -61,7 +61,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.6.1
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.0
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
diff --git a/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml b/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
index c0334d9..8082e36 100644
--- a/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
+++ b/tests/golden/openshift4/csi-cloudscale/csi-cloudscale/01_helm_chart/csi-cloudscale/templates/statefulset.yaml
@@ -81,7 +81,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.6.1
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.0
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources: