diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml
index a8332c117..249753014 100644
--- a/roles/kalite/tasks/main.yml
+++ b/roles/kalite/tasks/main.yml
@@ -29,10 +29,10 @@
   when: not test_kalite_installed.stat.exists
 
 - include_tasks: setup-f18.yml
-  when: not test_kalite_installed.stat.exists and is_F18
+  when: not test_kalite_installed.stat.exists and is_F18 and kalite_install
 
 - include_tasks: setup.yml
-  when: not test_kalite_installed.stat.exists and not is_F18
+  when: not test_kalite_installed.stat.exists and not is_F18 and kalite_install
 
 - include_tasks: enable.yml
   when: kalite_install or kalite_installed is defined