diff --git a/roles/validate-simple/tasks/main.yml b/roles/validate-simple/tasks/main.yml
index 04ef3603c..085fc83a0 100644
--- a/roles/validate-simple/tasks/main.yml
+++ b/roles/validate-simple/tasks/main.yml
@@ -8,12 +8,16 @@
   copy:
     src: "tenantvm_floatingip.yaml"
     dest: "{{ working_dir }}/tenantvm_floatingip.yaml"
-  when: template_check is defined and not template_check.stat.exists
+  when:
+    - validate_template == "tenantvm_floatingip.yaml"
+    - not template_check.stat.exists
 
 - name: Old THT workaround, override the template path
   set_fact:
     validate_template_path: "{{ working_dir }}"
-  when: template_check is defined and not template_check.stat.exists
+  when:
+    - validate_template == "tenantvm_floatingip.yaml"
+    - not template_check.stat.exists
 
 - name: Create overcloud validate script
   template: