diff --git a/roles/system/tasks/main.yaml b/roles/system/tasks/main.yaml
index 4ce6c5a..a5f051d 100644
--- a/roles/system/tasks/main.yaml
+++ b/roles/system/tasks/main.yaml
@@ -40,6 +40,8 @@
   community.general.timezone:
     name: "{{ system_timezone }}"
   when: "system_timezone"
+  tags:
+    - timezone
   become: true
 
 - name: Create necessary groups
@@ -48,6 +50,8 @@
     state: present
   loop: "{{ system_users | map(attribute='groups') | flatten | unique }}"
   when: "system_users"
+  tags:
+    - groups
   become: true
 
 - name: Set up system users
@@ -59,6 +63,9 @@
     shell: "{{ item.shell | default('/bin/bash') }}"
   loop: "{{ system_users }}"
   when: "system_users"
+  tags:
+    - users
+    - groups
   become: true
 
 - name: Add authorized SSH keys