diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
index af46951d..061030d2 100755
--- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
+++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -5,6 +5,7 @@ metadata:
   name: csi-nfs-controller
   namespace: {{ .Release.Namespace }}
 {{ include "nfs.labels" . | indent 2 }}
+    app: csi-nfs-controller
 spec:
   replicas: {{ .Values.controller.replicas }}
   selector:
@@ -15,6 +16,16 @@ spec:
 {{ include "nfs.labels" . | indent 6 }}
         app: csi-nfs-controller
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - csi-nfs-controller
+            topologyKey: kubernetes.io/hostname
       hostNetwork: true  # controller also needs to mount nfs to create dir
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: csi-nfs-controller-sa
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index 05324031..1e7756e4 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 metadata:
   name: csi-nfs-controller
   namespace: kube-system
+  labels:
+    app: csi-nfs-controller
 spec:
   replicas: 2
   selector:
@@ -14,6 +16,16 @@ spec:
       labels:
         app: csi-nfs-controller
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - csi-nfs-controller
+              topologyKey: kubernetes.io/hostname
       hostNetwork: true  # controller also needs to mount nfs to create dir
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: csi-nfs-controller-sa