diff --git a/common/playbooks/k8s.yaml b/common/playbooks/k8s.yaml
index a53ab7ac3cfe8a16d1adbe0410e617b1c4b67c21..2a0ce76bc39d8c96c009fdbb24b90ff5e1add84c 100644
--- a/common/playbooks/k8s.yaml
+++ b/common/playbooks/k8s.yaml
@@ -607,9 +607,10 @@
         when: true
       - name: Get GPU node hostnames
         shell: |-
-          kubectl get nodes --no-headers -o custom-columns=NAME:.metadata.name | grep gpu
+          kubectl get nodes --no-headers -o custom-columns=NAME:.metadata.name | grep -- -gpu-
         register: gpu_nodes
-        changed_when: true
+        changed_when: false
+        failed_when: gpu_nodes.rc != 0 and gpu_nodes.rc != 1
         when: true
       - name: Print GPU node hostnames
         debug: