diff --git a/roles/fai/tasks/main.yml b/roles/fai/tasks/main.yml
index 97f1113..ac6346b 100644
--- a/roles/fai/tasks/main.yml
+++ b/roles/fai/tasks/main.yml
@@ -78,17 +78,20 @@
 - name: "Prepare FAI"
   import_tasks: fai-prepare.yml
   tags:
+    - fai
     - fai_prepare
 
 - name: "Configure '{{ fai_dir_etc }}'"
   import_tasks: fai-etc-dir.yml
   tags:
+    - fai
     - fai_etc_dir
     - fai_nfsroot
 
 - name: "Configure '{{ fai_dir_config }}'"
   import_tasks: fai-config-dir.yml
   tags:
+    - fai
     - fai_config_dir
 
 ### RUN ALL SO FAR NOTIFIED HANDLERS NOW
@@ -98,15 +101,18 @@
 - name: "Create FAI nfsroot"
   import_tasks: fai-nfsroot.yml
   tags:
+    - fai
     - fai_nfsroot
 
 - name: "Configure FAI PXE"
   import_tasks: fai-pxe.yml
   tags:
+    - fai
     - fai_pxe
     - fai_ipxe
 
 - name: "Configure FAI iPXE"
   import_tasks: fai-ipxe.yml
   tags:
+    - fai
     - fai_ipxe