diff --git a/CHANGES.md b/CHANGES.md
index 79d9d8ce1c45fa2d19a1ee56e8afbe5d27072c20..16d5a096cde0f5f735f8a1014bd69deaf02574b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,5 @@
 # Changes
+## v1.6.0
 
 As of release v1.6.0 we moved the release notes to Github Releases: https://github.com/hetznercloud/csi-driver/releases
 
diff --git a/README.md b/README.md
index 22b566ba374323bf457d38ba95794bb86de7b257..2b7c62a31df34b8d2f4a3f5b41d0651011b21275 100644
--- a/README.md
+++ b/README.md
@@ -88,14 +88,14 @@ We aim to support the latest three versions of Kubernetes. After a new
 Kubernetes version has been released we will stop supporting the oldest
 previously supported version. This does not necessarily mean that the
 CSI driver does not still work with this version. However, it means that
-we do not test that version anymore. Additionally we will not fix bugs
+we do not test that version anymore. Additionally, we will not fix bugs
 related only to an unsupported version.
 
 | Kubernetes | CSI Driver    | Deployment File                                                                                    |
 | ---------- | -------------:| --------------------------------------------------------------------------------------------------:|
-| 1.21       | master        | https://raw.githubusercontent.com/hetznercloud/csi-driver/master/deploy/kubernetes/hcloud-csi.yml  |
-| 1.20       | master        | https://raw.githubusercontent.com/hetznercloud/csi-driver/master/deploy/kubernetes/hcloud-csi.yml  |
-| 1.19       | 1.5.1, master | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.5.1/deploy/kubernetes/hcloud-csi.yml  |
+| 1.22       | 1.6.0, master | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml  |
+| 1.21       | 1.6.0, master | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml  |
+| 1.20       | 1.6.0, master | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml  |
 
 ## E2E Tests
 
diff --git a/deploy/kubernetes/hcloud-csi.yml b/deploy/kubernetes/hcloud-csi.yml
index 443cf6f6cb7c45e5fefbb924a6ad3d6b0598d7f8..110b47ac9b688d2f3bc6d9160b1603a1a08e9961 100644
--- a/deploy/kubernetes/hcloud-csi.yml
+++ b/deploy/kubernetes/hcloud-csi.yml
@@ -124,7 +124,6 @@ spec:
             allowPrivilegeEscalation: true
         - name: csi-resizer
           image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
-
           volumeMounts:
             - name: socket-dir
               mountPath: /run/csi
@@ -147,7 +146,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
         - name: hcloud-csi-driver
-          image: hetznercloud/hcloud-csi-driver:1.5.3
+          image: hetznercloud/hcloud-csi-driver:1.6.0
           imagePullPolicy: Always
           env:
             - name: CSI_ENDPOINT
@@ -221,6 +220,15 @@ spec:
           operator: Exists
         - key: CriticalAddonsOnly
           operator: Exists
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: "instance.hetzner.cloud/is-root-server"
+                    operator: NotIn
+                    values:
+                      - "true"
       serviceAccount: hcloud-csi
       containers:
         - name: csi-node-driver-registrar
@@ -241,7 +249,7 @@ spec:
           securityContext:
             privileged: true
         - name: hcloud-csi-driver
-          image: hetznercloud/hcloud-csi-driver:1.5.3
+          image: hetznercloud/hcloud-csi-driver:1.6.0
           imagePullPolicy: Always
           env:
             - name: CSI_ENDPOINT
@@ -249,7 +257,7 @@ spec:
             - name: METRICS_ENDPOINT
               value: 0.0.0.0:9189
             - name: ENABLE_METRICS
-              value:  "true"
+              value: "true"
             - name: HCLOUD_TOKEN
               valueFrom:
                 secretKeyRef:
diff --git a/driver/driver.go b/driver/driver.go
index 2771beafa0f83f6e5b347b833ddcb2a4dcd0e1db..0681199dd2685f6dac2b9fd023666f237d982cdb 100644
--- a/driver/driver.go
+++ b/driver/driver.go
@@ -2,7 +2,7 @@ package driver
 
 const (
 	PluginName    = "csi.hetzner.cloud"
-	PluginVersion = "1.5.2"
+	PluginVersion = "1.6.0"
 
 	MaxVolumesPerNode = 16
 	MinVolumeSize     = 10 // GB