diff --git a/class/defaults.yml b/class/defaults.yml
index 818ff43..931824c 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -7,13 +7,13 @@ parameters:
     charts:
       csi-cloudscale:
         source: https://cloudscale-ch.github.io/csi-cloudscale
-        version: 1.5.2
+        version: 1.5.5
 
     images:
       cloudscale-csi-plugin:
         registry: quay.io
         repository: cloudscalech/cloudscale-csi-plugin
-        tag: v4.0.3
+        tag: v4.0.4
 
     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 6fc91f4..d068bad 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:v4.0.3
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.4
           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 96d6ff0..1f57a2b 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
@@ -98,7 +98,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.3
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.4
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
@@ -112,7 +112,7 @@ spec:
               name: socket-dir
       hostNetwork: true
       priorityClassName: system-cluster-critical
-      serviceAccount: csi-cloudscale-controller-sa
+      serviceAccountName: csi-cloudscale-controller-sa
       volumes:
         - emptyDir: {}
           name: socket-dir
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 9a48fdf..326dae9 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:v4.0.3
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.4
           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 dc4832d..a79ccf6 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
@@ -96,7 +96,7 @@ spec:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.3
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v4.0.4
           imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
@@ -108,7 +108,7 @@ spec:
               name: socket-dir
       hostNetwork: true
       priorityClassName: system-cluster-critical
-      serviceAccount: csi-cloudscale-controller-sa
+      serviceAccountName: csi-cloudscale-controller-sa
       volumes:
         - emptyDir: {}
           name: socket-dir