diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c12e52..fe37653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Updated
+
+- Extract registry from container images to allow set it for all images on value level.
+- Change node-selector values for to fit new scheme.
+- Configure same service account for both controller and node to simplify IRSA role permissions.
+
 ## [1.1.0] - 2023-10-30
 
 ### Changed
diff --git a/helm/aws-efs-csi-driver/templates/controller.yaml b/helm/aws-efs-csi-driver/templates/controller.yaml
index d9abb4f..38440a7 100644
--- a/helm/aws-efs-csi-driver/templates/controller.yaml
+++ b/helm/aws-efs-csi-driver/templates/controller.yaml
@@ -39,7 +39,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
@@ -80,7 +80,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: csi-provisioner
-          image: {{ printf "%s:%s" .Values.sidecars.csiProvisioner.image.repository .Values.sidecars.csiProvisioner.image.tag }}
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.csiProvisioner.image.repository }}:{{ .Values.sidecars.csiProvisioner.image.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --v={{ .Values.controller.logLevel }}
@@ -96,7 +96,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: liveness-probe
-          image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.livenessProbe.image.repository }}:{{ .Values.sidecars.livenessProbe.image.tag }}"
           args:
             - --csi-address=/csi/csi.sock
             - --health-port={{ .Values.controller.healthPort }}
diff --git a/helm/aws-efs-csi-driver/templates/node.yaml b/helm/aws-efs-csi-driver/templates/node.yaml
index e5880ab..84e1e75 100644
--- a/helm/aws-efs-csi-driver/templates/node.yaml
+++ b/helm/aws-efs-csi-driver/templates/node.yaml
@@ -44,7 +44,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -84,7 +84,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: node-driver-registrar
-          image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.nodeDriverRegistrar.image.repository }}:{{ .Values.sidecars.nodeDriverRegistrar.image.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -107,7 +107,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: liveness-probe
-          image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          image: "{{ .Values.image.registry }}/{{ .Values.sidecars.livenessProbe.image.repository }}:{{ .Values.sidecars.livenessProbe.image.tag }}"
           args:
             - --csi-address=/csi/csi.sock
             - --health-port={{ .Values.node.healthPort }}
diff --git a/helm/aws-efs-csi-driver/values.yaml b/helm/aws-efs-csi-driver/values.yaml
index 76023eb..6684c54 100644
--- a/helm/aws-efs-csi-driver/values.yaml
+++ b/helm/aws-efs-csi-driver/values.yaml
@@ -8,24 +8,25 @@ namespace: kube-system
 replicaCount: 1
 
 image:
-  repository: docker.io/giantswarm/aws-efs-csi-driver
+  registry: docker.io
+  repository: giantswarm/aws-efs-csi-driver
   tag: "v1.7.0"
   pullPolicy: IfNotPresent
 
 sidecars:
   livenessProbe:
     image:
-      repository: docker.io/giantswarm/livenessprobe
+      repository: giantswarm/livenessprobe
       tag: "v2.11.0"
     resources: {}
   nodeDriverRegistrar:
     image:
-      repository: docker.io/giantswarm/csi-node-driver-registrar
+      repository: giantswarm/csi-node-driver-registrar
       tag: "v2.9.1"
     resources: {}
   csiProvisioner:
     image:
-      repository: docker.io/giantswarm/csi-provisioner
+      repository: giantswarm/csi-provisioner
       tag: "v3.6.2"
     resources: {}
 
@@ -52,13 +53,13 @@ node:
   resources:
     {}
   nodeSelector:
-    kubernetes.io/role: worker
+    node.kubernetes.io/worker: ""
   tolerations:
     - operator: Exists
   # Specifies whether a service account should be created
   serviceAccount:
     create: true
-    name: efs-csi-node-sa
+    name: efs-csi-sa
     annotations: {}
     ## Enable if EKS IAM for SA is used
     #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role
@@ -84,13 +85,13 @@ controller:
   resources:
     {}
   nodeSelector:
-    kubernetes.io/role: master
+    node-role.kubernetes.io/control-plane: ""
   tolerations:
     - operator: Exists
   affinity: {}
   serviceAccount:
-    create: true
-    name: efs-csi-controller-sa
+    create: false
+    name: efs-csi-sa
     annotations: {}
     ## Enable if EKS IAM for SA is used
     #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role