diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml
index 8b6c739..3d79463 100644
--- a/packer/ansible/playbook.yml
+++ b/packer/ansible/playbook.yml
@@ -3,35 +3,15 @@
   any_errors_fatal: yes
   roles:
     - role: packages
-      tags:
-        - packages
     - role: superuser
-      tags:
-        - superuser
     - role: auth
-      tags:
-        - auth
     - role: labsync
-      tags:
-        - labsync
     - role: windowmanager
-      tags:
-        - windowmanager
     - role: l10n
-      tags:
-        - l10n
     - role: inkscape
-      tags:
-        - inkscape
     - role: fablab
-      tags:
-        - fablab
     - role: hardware
-      tags:
-        - hardware
     - role: docker
-      tags:
-        - docker
   vars:
     auth:
       sudo:
diff --git a/packer/ansible/roles/auth/tasks/main.yml b/packer/ansible/roles/auth/tasks/main.yml
index e13fe8d..aef03de 100644
--- a/packer/ansible/roles/auth/tasks/main.yml
+++ b/packer/ansible/roles/auth/tasks/main.yml
@@ -1,3 +1,10 @@
 ---
-- import_tasks: debug.yml
-- import_tasks: sudo.yml
+- block:
+  - import_tasks: debug.yml
+    tags:
+      - auth:debug
+  - import_tasks: sudo.yml
+    tags:
+      - auth:sudo
+  tags:
+    - auth
diff --git a/packer/ansible/roles/docker/tasks/main.yml b/packer/ansible/roles/docker/tasks/main.yml
index f9b4a60..1b11c3d 100644
--- a/packer/ansible/roles/docker/tasks/main.yml
+++ b/packer/ansible/roles/docker/tasks/main.yml
@@ -1,8 +1,10 @@
 ---
-- import_tasks: packages.yml
+- block:
+  - import_tasks: packages.yml
+    tags:
+      - docker:packages
+  - import_tasks: lvm-setup-service.yml
+    tags:
+      - docker:lvm-setup-service
   tags:
-    - docker:packages
-
-- import_tasks: lvm-setup-service.yml
-  tags:
-    - docker:lvm-setup-service
+    - docker
diff --git a/packer/ansible/roles/fablab/tasks/main.yml b/packer/ansible/roles/fablab/tasks/main.yml
index d8e8d8b..3e50409 100644
--- a/packer/ansible/roles/fablab/tasks/main.yml
+++ b/packer/ansible/roles/fablab/tasks/main.yml
@@ -1,22 +1,25 @@
 ---
-- import_tasks: arduino.yml
+- block:
+  - import_tasks: arduino.yml
+    tags:
+      - fablab:arduino
+  - import_tasks: cad.yml
+    tags:
+      - fablab:cad
+  - import_tasks: cura.yml
+    tags:
+      - fablab:cura
+  - import_tasks: fritzing.yml
+    tags:
+      - fablab:fritzing
+  - import_tasks: kicad.yml
+    tags:
+      - fablab:kicad
+  - import_tasks: visicut.yml
+    tags:
+      - fablab:visicut
+  - import_tasks: metalcut.yml
+    tags:
+      - fablab:metalcut
   tags:
-    - fablab:arduino
-- import_tasks: cad.yml
-  tags:
-    - fablab:cad
-- import_tasks: cura.yml
-  tags:
-    - fablab:cura
-- import_tasks: fritzing.yml
-  tags:
-    - fablab:fritzing
-- import_tasks: kicad.yml
-  tags:
-    - fablab:kicad
-- import_tasks: visicut.yml
-  tags:
-    - fablab:visicut
-- import_tasks: metalcut.yml
-  tags:
-    - fablab:metalcut
+    - fablab
diff --git a/packer/ansible/roles/hardware/tasks/main.yml b/packer/ansible/roles/hardware/tasks/main.yml
index e269158..fe30078 100644
--- a/packer/ansible/roles/hardware/tasks/main.yml
+++ b/packer/ansible/roles/hardware/tasks/main.yml
@@ -1,2 +1,7 @@
 ---
-- import_tasks: firmware.yml
+- block:
+  - import_tasks: firmware.yml
+    tags:
+      - hardware:firmware
+  tags:
+    - hardware
diff --git a/packer/ansible/roles/inkscape/tasks/main.yml b/packer/ansible/roles/inkscape/tasks/main.yml
index a9374b6..a89d170 100644
--- a/packer/ansible/roles/inkscape/tasks/main.yml
+++ b/packer/ansible/roles/inkscape/tasks/main.yml
@@ -1,2 +1,7 @@
 ---
-- import_tasks: base.yml
+- block:
+  - import_tasks: base.yml
+    tags:
+      - inkscape:base
+  tags:
+    - inkscape
diff --git a/packer/ansible/roles/l10n/tasks/main.yml b/packer/ansible/roles/l10n/tasks/main.yml
index d55a754..71f9f99 100644
--- a/packer/ansible/roles/l10n/tasks/main.yml
+++ b/packer/ansible/roles/l10n/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
-- import_tasks: keyboard-configuration.yml
-- import_tasks: locale.yml
-- import_tasks: timezone.yml
+- block:
+  - import_tasks: keyboard-configuration.yml
+    tags:
+      - l10n:keyboard-configuration
+  - import_tasks: locale.yml
+    tags:
+      - l10n:locale
+  - import_tasks: timezone.yml
+    tags:
+      - l10n:timezone
+  tags:
+    - l10n
diff --git a/packer/ansible/roles/labsync/tasks/main.yml b/packer/ansible/roles/labsync/tasks/main.yml
index 5520f9a..6d57c2d 100644
--- a/packer/ansible/roles/labsync/tasks/main.yml
+++ b/packer/ansible/roles/labsync/tasks/main.yml
@@ -1,7 +1,10 @@
 ---
-- import_tasks: seeder.yml
+- block:
+  - import_tasks: seeder.yml
+    tags:
+      - labsync:seeder
+  - import_tasks: localboot.yml
+    tags:
+      - labsync:localboot
   tags:
-    - labsync:seeder
-- import_tasks: localboot.yml
-  tags:
-    - labsync:localboot
+    - labsync
diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml
index d7ced84..65a6e73 100644
--- a/packer/ansible/roles/network-manager/tasks/main.yml
+++ b/packer/ansible/roles/network-manager/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
-- name: install network-manager
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - network-manager
-    - network-manager-gnome
+- block:
+  - name: install network-manager
+    apt:
+      name: "{{ item }}"
+      state: present
+    with_items:
+      - network-manager
+      - network-manager-gnome
+tags:
+  - network-manager
diff --git a/packer/ansible/roles/packages/tasks/main.yml b/packer/ansible/roles/packages/tasks/main.yml
index 721c6b9..a9a9168 100644
--- a/packer/ansible/roles/packages/tasks/main.yml
+++ b/packer/ansible/roles/packages/tasks/main.yml
@@ -1,3 +1,6 @@
 ---
-- import_tasks: sources.yml
-- import_tasks: debian.yml
+- block:
+  - import_tasks: sources.yml
+  - import_tasks: debian.yml
+  tags:
+    - packages
diff --git a/packer/ansible/roles/superuser/tasks/main.yml b/packer/ansible/roles/superuser/tasks/main.yml
index 2b8fa14..4ac2f99 100644
--- a/packer/ansible/roles/superuser/tasks/main.yml
+++ b/packer/ansible/roles/superuser/tasks/main.yml
@@ -1,11 +1,14 @@
-- name: create root .ssh directory
-  file:
-    path: /root/.ssh
-    owner: root
-    group: root
-    state: directory
+- block:
+  - name: create root .ssh directory
+    file:
+      path: /root/.ssh
+      owner: root
+      group: root
+      state: directory
 
-- name: set authorized keys for root user
-  copy:
-    src: files/authorized_keys
-    dest: /root/.ssh/authorized_keys
+  - name: set authorized keys for root user
+    copy:
+      src: files/authorized_keys
+      dest: /root/.ssh/authorized_keys
+  tags:
+    - superuser
diff --git a/packer/ansible/roles/windowmanager/tasks/main.yml b/packer/ansible/roles/windowmanager/tasks/main.yml
index be2cb0a..5761966 100644
--- a/packer/ansible/roles/windowmanager/tasks/main.yml
+++ b/packer/ansible/roles/windowmanager/tasks/main.yml
@@ -1,10 +1,13 @@
 ---
-- import_tasks: lightdm.yml
+- block:
+  - import_tasks: lightdm.yml
+    tags:
+      - windowmanager:lightdm
+  - import_tasks: awesome.yml
+    tags:
+      - windowmanager:awesome
+  - import_tasks: mate.yml
+    tags:
+      - windowmanager:mate
   tags:
-    - windowmanager:lightdm
-- import_tasks: awesome.yml
-  tags:
-    - windowmanager:awesome
-- import_tasks: mate.yml
-  tags:
-    - windowmanager:mate
+    - windowmanager