diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml
index 8251cbef8..6ac4e5655 100644
--- a/roles/7-edu-apps/tasks/main.yml
+++ b/roles/7-edu-apps/tasks/main.yml
@@ -1,41 +1,41 @@
-- name: BEGINNING Educational Apps and Content Installed
-  command: echo BEGINNING Educational Apps and Content Installed
+- name: ...IS BEGINNING ============================================]
+  command: echo
 
-- include_role:
-    name: moodle
-#   static: no
-#   tags: ['olpc','moodle','edu-apps']
-  when: moodle_install
-
-- include_role:
-    name: osm
-#   tags: ['olpc','moodle','edu-apps']
-  when: osm_install
-
-- include_role:
-    name: pathagar
-#   ['pathagar','edu-apps']
-  when: pathagar_install
-
-- include_role:
-    name: rachel
-#   ['rachel','edu-apps']
-  when: rachel_install
-
-- include_role:
+- name: KALITE
+  include_role:
     name: kalite
-#   ['kalite','edu-apps']
   when: kalite_install
+  tags: kalite
 
-- include_role:
+- name: KIWIX
+  include_role:
     name: kiwix
-#   ['kiwix','edu-apps']
   when: kiwix_install
+  tags: kiwix
 
-- include_role:
+- name: MOODLE
+  include_role:
+    name: moodle
+  when: moodle_install
+  tags: olpc, moodle
+
+- name: OSM
+  include_role:
+    name: osm
+  when: osm_install
+  tags: osm
+
+- name: PATHAGAR
+  include_role:
+    name: pathagar
+  when: pathagar_install
+  tags: pathagar, edu-apps
+
+- name: SUGARIZER
+  include_role:
     name: sugarizer
-#   ['sugarizer','edu-apps']
   when: sugarizer_install
+  tags: sugarizer
 
-- name: COMPLETING Educational Apps and Content Installed
-  command: echo COMPLETING Educational Apps and Content Installed
+- name: ...WAS COMPLETED ===========================================]
+  command: echo