diff --git a/roles/kubernetes/node/labels_taints/tasks/labels.yaml b/roles/kubernetes/node/labels_taints/tasks/labels.yaml
index 3954464..232c6f2 100644
--- a/roles/kubernetes/node/labels_taints/tasks/labels.yaml
+++ b/roles/kubernetes/node/labels_taints/tasks/labels.yaml
@@ -4,7 +4,7 @@
 ---
 - name: Applying labels
   ansible.builtin.shell: |
-    kubectl label nodes {{ ansible_hostname }} {{ label }} --overwrite
+    kubectl label nodes -l 'kubernetes.io/hostname in ({{ ansible_hostname }},{{ ansible_fqdn }})' {{ label }} --overwrite
   with_items: "{{ labels }}"
   loop_control:
     loop_var: label
diff --git a/roles/kubernetes/node/labels_taints/tasks/taints.yaml b/roles/kubernetes/node/labels_taints/tasks/taints.yaml
index 48f778e..d293c05 100644
--- a/roles/kubernetes/node/labels_taints/tasks/taints.yaml
+++ b/roles/kubernetes/node/labels_taints/tasks/taints.yaml
@@ -4,7 +4,7 @@
 ---
 - name: Applying taints
   ansible.builtin.shell: |
-    kubectl taint nodes {{ ansible_hostname }} {{ taint }} --overwrite
+    kubectl taint nodes -l 'kubernetes.io/hostname in ({{ ansible_hostname }},{{ ansible_fqdn }})' {{ taint }} --overwrite
   with_items: "{{ taints }}"
   loop_control:
     loop_var: taint