diff --git a/tasks/main.yml b/tasks/main.yml
index 06b2c79..663f760 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,22 +2,29 @@
 - name: base | apt update cache
   apt:
     update_cache: yes
-    cache_valid_time: 86400 #One day
+    cache_valid_time: 86400
+  tags: [ 'packages', 'base' ]
 
 - name: base | install base packages
-  include_tasks: packages.yml
+  import_tasks: packages.yml
+  tags: [ 'packages', 'base' ]
 
 - name: base | configure locales
-  include_tasks: locales.yml
+  import_tasks: locales.yml
+  tags: [ 'locales', 'base' ]
 
 - name: base | install python packages
-  include_tasks: pip.yml
+  import_tasks: pip.yml
+  tags: [ 'pip', 'python' ]
 
 - name: base | install needrestart
-  include_tasks: needrestart.yml
+  import_tasks: needrestart.yml
+  tags: [ 'needrestart' ]
 
 - name: base | configure SSH
-  include_tasks: ssh.yml
+  import_tasks: ssh.yml
+  tags: [ 'ssh' ]
 
 - name: base | set datetime
-  include_tasks: datetime.yml
+  import_tasks: datetime.yml
+  tags: [ 'datetime', 'date', 'ntp' ]