diff --git a/charts/proxmox-cloud-controller-manager/Chart.yaml b/charts/proxmox-cloud-controller-manager/Chart.yaml
index 3d3cf73..62b0d8b 100644
--- a/charts/proxmox-cloud-controller-manager/Chart.yaml
+++ b/charts/proxmox-cloud-controller-manager/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/proxmox-cloud-controller-manager/README.md b/charts/proxmox-cloud-controller-manager/README.md
index 2d86f59..e7c1113 100644
--- a/charts/proxmox-cloud-controller-manager/README.md
+++ b/charts/proxmox-cloud-controller-manager/README.md
@@ -35,8 +35,13 @@ enabledControllers:
   - cloud-node-lifecycle
 
 # Deploy CCM only on control-plane nodes
-nodeSelector:
-  node-role.kubernetes.io/control-plane: ""
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
 tolerations:
   - key: node-role.kubernetes.io/control-plane
     effect: NoSchedule
diff --git a/charts/proxmox-cloud-controller-manager/README.md.gotmpl b/charts/proxmox-cloud-controller-manager/README.md.gotmpl
index b07e90d..f21f273 100644
--- a/charts/proxmox-cloud-controller-manager/README.md.gotmpl
+++ b/charts/proxmox-cloud-controller-manager/README.md.gotmpl
@@ -33,8 +33,13 @@ enabledControllers:
   - cloud-node-lifecycle
 
 # Deploy CCM only on control-plane nodes
-nodeSelector:
-  node-role.kubernetes.io/control-plane: ""
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
 tolerations:
   - key: node-role.kubernetes.io/control-plane
     effect: NoSchedule
diff --git a/charts/proxmox-cloud-controller-manager/ci/values.yaml b/charts/proxmox-cloud-controller-manager/ci/values.yaml
index 8e61cb0..2d59a03 100644
--- a/charts/proxmox-cloud-controller-manager/ci/values.yaml
+++ b/charts/proxmox-cloud-controller-manager/ci/values.yaml
@@ -1,11 +1,15 @@
-
 image:
   repository: ghcr.io/sergelogvinov/proxmox-cloud-controller-manager
   pullPolicy: Always
   tag: edge
 
-nodeSelector:
-  node-role.kubernetes.io/control-plane: ""
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
 
 logVerbosityLevel: 4
 
diff --git a/charts/proxmox-cloud-controller-manager/values.edge.yaml b/charts/proxmox-cloud-controller-manager/values.edge.yaml
index b90cc00..36d35f7 100644
--- a/charts/proxmox-cloud-controller-manager/values.edge.yaml
+++ b/charts/proxmox-cloud-controller-manager/values.edge.yaml
@@ -1,10 +1,14 @@
-
 image:
   pullPolicy: Always
   tag: edge
 
-nodeSelector:
-  node-role.kubernetes.io/control-plane: ""
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
 
 logVerbosityLevel: 4
 
diff --git a/charts/proxmox-cloud-controller-manager/values.talos.yaml b/charts/proxmox-cloud-controller-manager/values.talos.yaml
index 2730ddf..38b2e84 100644
--- a/charts/proxmox-cloud-controller-manager/values.talos.yaml
+++ b/charts/proxmox-cloud-controller-manager/values.talos.yaml
@@ -1,6 +1,10 @@
-
-nodeSelector:
-  node-role.kubernetes.io/control-plane: ""
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
 
 logVerbosityLevel: 4
 
diff --git a/charts/proxmox-cloud-controller-manager/values.yaml b/charts/proxmox-cloud-controller-manager/values.yaml
index 65fe02c..4d02003 100644
--- a/charts/proxmox-cloud-controller-manager/values.yaml
+++ b/charts/proxmox-cloud-controller-manager/values.yaml
@@ -123,6 +123,12 @@ tolerations:
 # -- Affinity for data pods assignment.
 # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 affinity: {}
+#  nodeAffinity:
+#    requiredDuringSchedulingIgnoredDuringExecution:
+#      nodeSelectorTerms:
+#      - matchExpressions:
+#        - key: node-role.kubernetes.io/control-plane
+#          operator: Exists
 
 # -- Additional volumes for Pods
 extraVolumes: []
diff --git a/docs/deploy/cloud-controller-manager-talos.yml b/docs/deploy/cloud-controller-manager-talos.yml
index 0e03c82..8f1994e 100644
--- a/docs/deploy/cloud-controller-manager-talos.yml
+++ b/docs/deploy/cloud-controller-manager-talos.yml
@@ -172,8 +172,13 @@ spec:
             - name: cloud-config
               mountPath: /etc/proxmox
               readOnly: true
-      nodeSelector:
-        node-role.kubernetes.io/control-plane: ""
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane
diff --git a/docs/deploy/cloud-controller-manager.yml b/docs/deploy/cloud-controller-manager.yml
index 63c49a5..8de8a9d 100644
--- a/docs/deploy/cloud-controller-manager.yml
+++ b/docs/deploy/cloud-controller-manager.yml
@@ -172,8 +172,13 @@ spec:
             - name: cloud-config
               mountPath: /etc/proxmox
               readOnly: true
-      nodeSelector:
-        node-role.kubernetes.io/control-plane: ""
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/control-plane