diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
index 3671208..69bde6a 100644
--- a/playbooks/bootstrap.yml
+++ b/playbooks/bootstrap.yml
@@ -13,29 +13,37 @@
       become: true
 
     # Enable Flathub repository and install configured flatpaks
-    - system/flatpak
+    - role: system/flatpak
+      tags: flatpak
 
     # Install Podman and configure UIDs/GIDs for rootless usage
     - role: system/podman
       become: true
+      tags: podman
 
     # Install and configure SSH server
     - role: system/sshd
       become: true
+      tags: sshd
 
     # Handle basic user configuration
     - user/base
 
     # Shell utilities
-    - user/shell/zsh
-    - user/shell/tmux
-    - user/editors/neovim
+    - role: user/shell/zsh
+      tags: zsh
+    - role: user/shell/tmux
+      tags: tmux
+    - role: user/editors/neovim
+      tags: neovim
 
     # Configure git
-    - user/git
+    - role: user/git
+      tags: git
 
     # Configure ssh
-    - user/ssh
+    - role: user/ssh
+      tags: ssh
 
     # Configure Alacritty terminal
     - role: user/terminals/alacritty
@@ -46,14 +54,17 @@
       tags: kitty
 
     # Install Bitwarden CLI
-    - user/secrets/bw
+    - role: user/secrets/bw
+      tags: bw
 
     # TODO: Install HashiCorp Vault
-    # - user/secrets/hcv
+    # - role: user/secrets/hcv
+    #   tags: hcv
 
     # Install and configure Emacs
     - role: user/editors/emacs
       tags: emacs
 
     # Install and configure VSCode
-    - user/editors/vscode
+    - role: user/editors/vscode
+      tags: vscode
diff --git a/roles/system/flatpak/tasks/main.yml b/roles/system/flatpak/tasks/main.yml
index de97f44..08bc744 100644
--- a/roles/system/flatpak/tasks/main.yml
+++ b/roles/system/flatpak/tasks/main.yml
@@ -5,7 +5,7 @@
     state: present
     flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
   become: true
-  tags: system-flatpak-enable-flathub
+  tags: flatpak/enable-flathub
 
 - name: Install flatpak apps
   community.general.packaging.os.flatpak:
diff --git a/roles/user/base/tasks/main.yml b/roles/user/base/tasks/main.yml
index 918ec69..bcc1f7c 100644
--- a/roles/user/base/tasks/main.yml
+++ b/roles/user/base/tasks/main.yml
@@ -4,6 +4,8 @@
 
 - name: Scripts
   ansible.builtin.include_tasks: scripts.yml
+  tags: user/base/scripts
 
 - name: Desktop utilities
   ansible.builtin.include_tasks: desktop-utilities.yml
+  tags: user/base/desktop-utilities
diff --git a/roles/user/editors/emacs/tasks/main.yml b/roles/user/editors/emacs/tasks/main.yml
index 7b7ced5..950cefd 100644
--- a/roles/user/editors/emacs/tasks/main.yml
+++ b/roles/user/editors/emacs/tasks/main.yml
@@ -8,4 +8,4 @@
     repo: https://github.com/hlissner/doom-emacs
     dest: ~/.emacs.d
     depth: 1
-  tags: user-emacs-doom
+  tags: emacs/doom
diff --git a/roles/user/shell/zsh/tasks/main.yml b/roles/user/shell/zsh/tasks/main.yml
index 955e670..eed993a 100644
--- a/roles/user/shell/zsh/tasks/main.yml
+++ b/roles/user/shell/zsh/tasks/main.yml
@@ -5,10 +5,11 @@
 
 - name: Plugin oh-my-zsh
   ansible.builtin.include_tasks: oh-my-zsh.yml
-  tags: zsh-oh-my-zsh
+  tags: zsh/oh-my-zsh
 
 - name: Plugin starship
   ansible.builtin.include_tasks: starship.yml
+  tags: zsh/starship
 
 - name: Set default shell
   become: true
diff --git a/roles/user/ssh/tasks/main.yml b/roles/user/ssh/tasks/main.yml
index 6be4275..f22b0e0 100644
--- a/roles/user/ssh/tasks/main.yml
+++ b/roles/user/ssh/tasks/main.yml
@@ -4,11 +4,11 @@
     src: files/ssh_config
     dest: ~/.ssh/config
     mode: 0600
-  tags: user-ssh-config
+  tags: ssh/config
 
 - name: Install ‹.ssh/authorized_keys›
   ansible.builtin.get_url:
     url: https://gitlab.com/mfocko.keys
     dest: ~/.ssh/authorized_keys
     mode: 0600
-  tags: user-ssh-authorized-keys
+  tags: ssh/authorized-keys