diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml
index a1ac24b37..8d65b3f04 100644
--- a/roles/kiwix/tasks/main.yml
+++ b/roles/kiwix/tasks/main.yml
@@ -33,12 +33,8 @@
     kiwix_force_install: True
   when: not kiwix_bin.stat.exists or reinstall is defined
 
-- include_tasks: kiwix_install.yml
-  when: (kiwix_install | bool and not kiwix_installed is defined) or kiwix_force_install | bool
-  tags:
-    - kiwix
+- include_tasks: install.yml
+  when: (kiwix_install and not kiwix_installed is defined) or kiwix_force_install
 
-- include_tasks: kiwix_enable.yml
-  when: kiwix_install | bool or kiwix_installed is defined
-  tags:
-    - kiwix
+- include_tasks: enable.yml
+  when: kiwix_enabled    # or kiwix_installed is defined