diff --git a/local-volume/helm/README.md b/local-volume/helm/README.md
index feaed7d5634262cd6c3cd5a60d5800da3fa1f5e6..86d91c00010808e2d6da13b16cab8c14578a08ab 100644
--- a/local-volume/helm/README.md
+++ b/local-volume/helm/README.md
@@ -54,7 +54,8 @@ provisioner chart and their default values.
 | common.rbac                            | Generating RBAC (Role Based Access Control) objects.                                                  | bool     | `true`                                                     |
 | common.namespace                       | Namespace where provisioner runs.                                                                     | str      | `default`                                                  |
 | common.useAlphaAPI                     | If running against pre-1.10 k8s version, the `useAlphaAPI` flag must be enabled.                      | bool     | `false`                                                    |
-| common.useJobForCleaning               | Is set to true, provisioner will use jobs-based block cleaning.                                       | bool     | `false`                                                    |
+| common.useJobForCleaning               | If set to true, provisioner will use jobs-based block cleaning.                                       | bool     | `false`                                                    |
+| common.useNodeNameOnly                 | If set to true, provisioner name will only use Node.Name and not Node.UID.                            | bool     | `false`                                                    |
 | common.minResyncPeriod                 | Resync period in reflectors will be random between `minResyncPeriod` and `2*minResyncPeriod`.         | str      | `5m0s`
 | common.configMapName                   | Provisioner ConfigMap name.                                                                           | str      | `local-provisioner-config`                                 |
 | classes.[n].name                       | StorageClass name.                                                                                    | str      | `-`                                                        |
diff --git a/local-volume/helm/examples/gce-pre1.9.yaml b/local-volume/helm/examples/gce-pre1.9.yaml
index 16bf4c78612c89e31e408a0882b9d12cc64d395c..f26d4fcaf68c2a60dbbf82d5add170f439184b80 100644
--- a/local-volume/helm/examples/gce-pre1.9.yaml
+++ b/local-volume/helm/examples/gce-pre1.9.yaml
@@ -1,5 +1,6 @@
 common:
   useAlphaAPI: true
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks"
diff --git a/local-volume/helm/examples/gce-retain.yaml b/local-volume/helm/examples/gce-retain.yaml
index 22af004b8f723303e891420eadef34999858938b..0051d23cf480e29a9cfae06834450fb206145ab5 100644
--- a/local-volume/helm/examples/gce-retain.yaml
+++ b/local-volume/helm/examples/gce-retain.yaml
@@ -1,3 +1,5 @@
+common:
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks/by-uuid/google-local-ssds-scsi-fs"
diff --git a/local-volume/helm/examples/gce.yaml b/local-volume/helm/examples/gce.yaml
index cf59426ddcfcd908d51d9ab739532a94d22a3e02..cd43a6a1b780d78a469a1e86f0409b70684b7ed8 100644
--- a/local-volume/helm/examples/gce.yaml
+++ b/local-volume/helm/examples/gce.yaml
@@ -2,6 +2,7 @@ common:
   # Beta PV.NodeAffinity field is used by default. If running against pre-1.10
   # k8s version, the `useAlphaAPI` flag must be enabled in the configMap.
   useAlphaAPI: false
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks/by-uuid/google-local-ssds-scsi-fs"
diff --git a/local-volume/helm/examples/gke.yaml b/local-volume/helm/examples/gke.yaml
index cd393ef47851af00906e9a3e81c34bb9371fd467..492261dd6bbfaadba4695490623ce80e78f154da 100644
--- a/local-volume/helm/examples/gke.yaml
+++ b/local-volume/helm/examples/gke.yaml
@@ -1,3 +1,5 @@
+common:
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks"
diff --git a/local-volume/helm/provisioner/templates/provisioner.yaml b/local-volume/helm/provisioner/templates/provisioner.yaml
index 93669d7d6fd3427d6dabbd0aa72ad6f6380a86b9..8d05bd1570b9eb35700e8636b27bd6f6b2f18d47 100644
--- a/local-volume/helm/provisioner/templates/provisioner.yaml
+++ b/local-volume/helm/provisioner/templates/provisioner.yaml
@@ -16,6 +16,9 @@ data:
 {{- if .Values.common.useJobForCleaning }}
   useJobForCleaning: "yes"
 {{- end}}
+{{- if .Values.common.useNodeNameOnly }}
+  useNodeNameOnly: "true"
+{{- end }}
 {{- if .Values.common.minResyncPeriod }}
   minResyncPeriod: {{ .Values.common.minResyncPeriod | quote }}
 {{- end}}
diff --git a/local-volume/helm/provisioner/values.yaml b/local-volume/helm/provisioner/values.yaml
index 5a3e8973b17f60eb04bb8a3b9a86dccb8b9303c2..e0ebca59f7d7b7383589fa06626c04906470130e 100644
--- a/local-volume/helm/provisioner/values.yaml
+++ b/local-volume/helm/provisioner/values.yaml
@@ -21,6 +21,11 @@ common:
   #
   useJobForCleaning: false
   #
+  # Provisioner name contains Node.UID by default. If set to true, the provisioner
+  # name will only use Node.Name.
+  #
+  useNodeNameOnly: false
+  #
   # Resync period in reflectors will be random between minResyncPeriod and
   # 2*minResyncPeriod. Default: 5m0s.
   #
@@ -67,7 +72,7 @@ daemonset:
   #
   # Defines Provisioner's image name including container registry.
   #
-  image: quay.io/external_storage/local-volume-provisioner:v2.1.0
+  image: quay.io/external_storage/local-volume-provisioner:v2.2.0
   #
   # Defines Image download policy, see kubernetes documentation for available values.
   #
@@ -94,4 +99,4 @@ daemonset:
   #
   # If configured, resources will set the requests/limits field to the Daemonset PodSpec.
   # Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-  resources: {}
\ No newline at end of file
+  resources: {}
diff --git a/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml b/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml
index afd7213d56a555d16f0ab88a2b62f630415ef2d1..5fd365d4eccfbe03da90788654f89d4e4b97d0bb 100644
--- a/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml
+++ b/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/baremetal-resyncperiod.yaml b/local-volume/helm/test/expected/baremetal-resyncperiod.yaml
index 88ffda5dccdba6d13749cfc604766160d9986278..d48c3a5127e247d64778cc227c9318d0c2452b16 100644
--- a/local-volume/helm/test/expected/baremetal-resyncperiod.yaml
+++ b/local-volume/helm/test/expected/baremetal-resyncperiod.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/baremetal-tolerations.yaml b/local-volume/helm/test/expected/baremetal-tolerations.yaml
index a418a156f0e8fabb0fd1cdecd0073761d09f7d7d..86d3d39b291cb85562abfa4ad760016866361c8a 100644
--- a/local-volume/helm/test/expected/baremetal-tolerations.yaml
+++ b/local-volume/helm/test/expected/baremetal-tolerations.yaml
@@ -35,7 +35,7 @@ spec:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -49,7 +49,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml b/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml
index 744b50ad8837d3cfc3ca9cc38750a098f4681fea..419c58dc17871ba46d83648dee104f035c2739fb 100644
--- a/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml
+++ b/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -53,7 +53,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/baremetal-without-rbac.yaml b/local-volume/helm/test/expected/baremetal-without-rbac.yaml
index 594070a13c7a892ff3f9d456f9469072726b9a43..5ef65e339e78669ed7c3b410691e3e6fbd968560 100644
--- a/local-volume/helm/test/expected/baremetal-without-rbac.yaml
+++ b/local-volume/helm/test/expected/baremetal-without-rbac.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -45,7 +45,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/baremetal.yaml b/local-volume/helm/test/expected/baremetal.yaml
index 4e542dafda5b1d063f7d72ecf549203660aa99de..4e60eaf04af303db1f22c162c87afada43ee9ffa 100644
--- a/local-volume/helm/test/expected/baremetal.yaml
+++ b/local-volume/helm/test/expected/baremetal.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/gce-pre1.9.yaml b/local-volume/helm/test/expected/gce-pre1.9.yaml
index b8786d939278391a3861baceb0b266b986d25705..2496cc7141467981b1edc9892d0b57363a1562b6 100644
--- a/local-volume/helm/test/expected/gce-pre1.9.yaml
+++ b/local-volume/helm/test/expected/gce-pre1.9.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: default
 data:
   useAlphaAPI: "true"
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks
@@ -30,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -44,7 +45,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/gce-retain.yaml b/local-volume/helm/test/expected/gce-retain.yaml
index fd4d1ff762ded3e0bbfbd7e1ad100724873b063d..dee00ae937ebf97d13ab8e61945973efa2751732 100644
--- a/local-volume/helm/test/expected/gce-retain.yaml
+++ b/local-volume/helm/test/expected/gce-retain.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -32,7 +33,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +47,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/gce.yaml b/local-volume/helm/test/expected/gce.yaml
index fd4d1ff762ded3e0bbfbd7e1ad100724873b063d..dee00ae937ebf97d13ab8e61945973efa2751732 100644
--- a/local-volume/helm/test/expected/gce.yaml
+++ b/local-volume/helm/test/expected/gce.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -32,7 +33,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +47,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/helm/test/expected/gke.yaml b/local-volume/helm/test/expected/gke.yaml
index 6c823aac2c6a0097cb0abdf2b64b54b4d1cd85ae..609e78d27b1d0b1f17705cfedf7c40e7a60e686c 100644
--- a/local-volume/helm/test/expected/gke.yaml
+++ b/local-volume/helm/test/expected/gke.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks
@@ -29,7 +30,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -43,7 +44,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config
diff --git a/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml b/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml
index 7a82832b7dcbc9da0df661614c14050e29ae7d23..18708fadec4fec485d670f1b3b9f329c4f68ee06 100644
--- a/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml
+++ b/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml
@@ -7,6 +7,7 @@ metadata:
   name: local-provisioner-config 
   namespace: default 
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |     
     local-scsi:
        hostDir: /mnt/disks
@@ -30,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           imagePullPolicy: "Always"
           name: provisioner 
           securityContext:
diff --git a/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml b/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml
index 6d21186ee909c32f19ed72f265507bee57e62471..40299fd91feaa08f27b1d7376be14704ec86ec85 100644
--- a/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml
+++ b/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml
@@ -7,6 +7,7 @@ metadata:
   name: local-provisioner-config 
   namespace: default 
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |     
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -33,7 +34,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           imagePullPolicy: "Always"
           name: provisioner 
           securityContext: