diff --git a/roles/system/tasks/main.yaml b/roles/system/tasks/main.yaml
index 4ce6c5a..fd14baf 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,15 +63,18 @@
     shell: "{{ item.shell | default('/bin/bash') }}"
   loop: "{{ system_users }}"
   when: "system_users"
+  tags:
+    - users
+    - groups
   become: true
 
 - name: Add authorized SSH keys
   ansible.posix.authorized_key:
-    user: "{{ item.name }}"
+    user: "{{ item.0.name }}"
     state: present
-    key: "{{ item.authorized_keys }}"
-  loop: "{{ system_users }}"
-  when: system_users is defined and item.authorized_keys is defined
+    key: "{{ item.1 }}"
+  loop: "{{ system_users | subelements('authorized_keys', skip_missing=True) }}"
+  when: system_users is defined
   tags:
     - ssh
   become: true
diff --git a/site.yaml b/site.yaml
index b77d574..6c056d1 100644
--- a/site.yaml
+++ b/site.yaml
@@ -49,12 +49,12 @@
     #     name: incus-install
     #   tags: incus
 
-- name: Raise infrastructure
-  hosts: localhost
-  tags: infrastructure
-  tasks:
-    - ansible.builtin.import_role:
-        name: infrastructure
+# - name: Raise infrastructure
+#   hosts: localhost
+#   tags: infrastructure
+#   tasks:
+#     - ansible.builtin.import_role:
+#         name: infrastructure
 
   # ansible-galaxy install geerlingguy.docker
 - name: Install docker