diff --git a/roles/freepbx/tasks/main.yml b/roles/freepbx/tasks/main.yml
index 8ac6af8..c09f6d6 100644
--- a/roles/freepbx/tasks/main.yml
+++ b/roles/freepbx/tasks/main.yml
@@ -1,18 +1,29 @@
 ---
 
-- import_tasks: ../includes/disable_selinux.yml
+- import_tasks: ../include_taskss/disable_selinux.yml
   tags: fpbx
-- include: directories.yml
-- include: facts.yml
-- include: archive_pre.yml
-  when: fpbx_install_mode == 'upgrade'
-- include: install.yml
-- include: conf.yml
-- include: iptables.yml
+- include_tasks_tasks: directories.yml
+  tags: always
+- include_tasks_tasks: facts.yml
+  tags: always
+- include_tasks_tasks: archive_pre.yml
+  when: fpbx_install_mode | default('none') == 'upgrade'
+  tags: always
+- include_tasks_tasks: install.yml
+  tags: always
+- include_tasks: conf.yml
+  tags: always
+- include_tasks: iptables.yml
   when: iptables_manage | default(True)
-- include: services.yml
-- include: archive_post.yml
-  when: fpbx_install_mode == 'upgrade'
-- include: filebeat.yml
-- include: write_version.yml
-- include: cleanup.yml
+  tags: always
+- include_tasks: services.yml
+  tags: always
+- include_tasks: archive_post.yml
+  when: fpbx_install_mode | default('none') == 'upgrade'
+  tags: always
+- include_tasks: filebeat.yml
+  tags: always
+- include_tasks: write_version.yml
+  tags: always
+- include_tasks: cleanup.yml
+  tags: always