diff --git a/cluster.yml b/cluster.yml
index 1d2f15bbf720a704a54f3134215bbf2a49388439..b2bc4b54c06a2831250dca2bcf9c2bb749727a6c 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -78,7 +78,7 @@
     - { role: kubespray-defaults}
     - { role: kubernetes/kubeadm, tags: kubeadm}
     - { role: network_plugin, tags: network }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
 
 - hosts: calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
diff --git a/scale.yml b/scale.yml
index 8b53b04f11ab16573f0a60cbdcb9d4254f629baa..27c32e9070b8455935c79b0c155ffdc4fea80924 100644
--- a/scale.yml
+++ b/scale.yml
@@ -46,5 +46,5 @@
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/kubeadm, tags: kubeadm }
     - { role: network_plugin, tags: network }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
   environment: "{{ proxy_env }}"
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index b3d17f5309a9547a8ee42d7d86ef1f1227b49a16..a20b1ec8815010c52d0ffcdb13ce6da1c28767fe 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -72,7 +72,7 @@
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/master, tags: master, upgrade_cluster_setup: true }
     - { role: kubernetes/client, tags: client }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
     - { role: kubernetes-apps/cluster_roles, tags: cluster-roles }
     - { role: upgrade/post-upgrade, tags: post-upgrade }
   environment: "{{ proxy_env }}"
@@ -96,7 +96,7 @@
     - { role: upgrade/pre-upgrade, tags: pre-upgrade }
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/kubeadm, tags: kubeadm }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
     - { role: upgrade/post-upgrade, tags: post-upgrade }
   environment: "{{ proxy_env }}"