diff --git a/README.md b/README.md
index 2d9ed3c14..3cd058f85 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ $ kubectl get pods
 NAME                         READY   STATUS    RESTARTS   AGE
 csi-hostpath-attacher-0      1/1     Running   0          5m47s
 csi-hostpath-provisioner-0   1/1     Running   0          5m47s
-csi-hostpathplugin-lzzlc     2/2     Running   0          5m45s
+csi-hostpathplugin-0         2/2     Running   0          5m45s
 ```
 
 From the root directory, deploy the application pods including a storage class, a PVC, and a pod which mounts a volume using the Hostpath driver found in directory `./examples`:
diff --git a/deploy/hostpath/csi-hostpath-attacher.yaml b/deploy/hostpath/csi-hostpath-attacher.yaml
index df7f0d63a..1b57dfcd8 100644
--- a/deploy/hostpath/csi-hostpath-attacher.yaml
+++ b/deploy/hostpath/csi-hostpath-attacher.yaml
@@ -27,6 +27,16 @@ spec:
       labels:
         app: csi-hostpath-attacher
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - csi-hostpathplugin
+            topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
diff --git a/deploy/hostpath/csi-hostpath-plugin.yaml b/deploy/hostpath/csi-hostpath-plugin.yaml
index d28862cc7..f21f5c987 100644
--- a/deploy/hostpath/csi-hostpath-plugin.yaml
+++ b/deploy/hostpath/csi-hostpath-plugin.yaml
@@ -1,8 +1,9 @@
-kind: DaemonSet
+kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: csi-hostpathplugin
 spec:
+  serviceName: "csi-hostpathplugin"
   selector:
     matchLabels:
       app: csi-hostpathplugin
diff --git a/deploy/hostpath/csi-hostpath-provisioner.yaml b/deploy/hostpath/csi-hostpath-provisioner.yaml
index 12aca8ca4..6cc4f6bc4 100644
--- a/deploy/hostpath/csi-hostpath-provisioner.yaml
+++ b/deploy/hostpath/csi-hostpath-provisioner.yaml
@@ -27,6 +27,16 @@ spec:
       labels:
         app: csi-hostpath-provisioner
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - csi-hostpathplugin
+            topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
diff --git a/examples/csi-app.yaml b/examples/csi-app.yaml
index 671263091..51afa2910 100644
--- a/examples/csi-app.yaml
+++ b/examples/csi-app.yaml
@@ -3,6 +3,16 @@ apiVersion: v1
 metadata:
   name: my-csi-app
 spec:
+  affinity:
+    podAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: app
+            operator: In
+            values:
+            - csi-hostpathplugin
+        topologyKey: kubernetes.io/hostname
   containers:
     - name: my-frontend
       image: busybox
@@ -13,4 +23,4 @@ spec:
   volumes:
     - name: my-csi-volume
       persistentVolumeClaim:
-        claimName: csi-pvc # defined in csi-pvs.yaml
\ No newline at end of file
+        claimName: csi-pvc # defined in csi-pvs.yaml