diff --git a/playbooks/3_service/ansible.yml b/playbooks/3_service/ansible.yml
index a94990e6..e7aebf82 100644
--- a/playbooks/3_service/ansible.yml
+++ b/playbooks/3_service/ansible.yml
@@ -1,4 +1,6 @@
 ---
 - hosts: ansible
   roles:
-    - { role: ansible-role-pip, tags: "pip", become: true }
+    - role: ansible-role-pip
+      tags: "pip"
+      become: true
diff --git a/playbooks/3_service/blocky.yml b/playbooks/3_service/blocky.yml
index 267abc3e..01d3c160 100644
--- a/playbooks/3_service/blocky.yml
+++ b/playbooks/3_service/blocky.yml
@@ -1,5 +1,7 @@
 ---
 - hosts: blocky
   roles:
-    - { role: mgrote_systemd_resolved, tags: "resolved" }
-    - { role: mgrote_blocky, tags: "blocky" }
+    - role: mgrote_systemd_resolved
+      tags: "resolved"
+    - role: mgrote_blocky
+      tags: "blocky"
diff --git a/playbooks/3_service/docker.yml b/playbooks/3_service/docker.yml
index 9c1cb39b..568953f4 100644
--- a/playbooks/3_service/docker.yml
+++ b/playbooks/3_service/docker.yml
@@ -1,9 +1,21 @@
 ---
 - hosts: docker
   roles:
-    - { role: mgrote_systemd_resolved, tags: "dns", become: true }
-    - { role: ansible-role-pip, tags: "pip", become: true }
-    - { role: ansible-role-docker, tags: "docker", become: true }
-    - { role: ansible_role_ctop, tags: "ctop", become: true }
-    - { role: mgrote_set_permissions, tags: "perm", become: true }
-    - { role: mgrote_docker_compose_inline, tags: "compose", become: true }
+    - role: mgrote_systemd_resolved
+      tags: "dns"
+      become: true
+    - role: ansible-role-pip
+      tags: "pip"
+      become: true
+    - role: ansible-role-docker
+      tags: "docker"
+      become: true
+    - role: ansible_role_ctop
+      tags: "ctop"
+      become: true
+    - role: mgrote_set_permissions
+      tags: "perm"
+      become: true
+    - role: mgrote_docker_compose_inline
+      tags: "compose"
+      become: true
diff --git a/playbooks/3_service/fileserver.yml b/playbooks/3_service/fileserver.yml
index 399ac160..6560db39 100644
--- a/playbooks/3_service/fileserver.yml
+++ b/playbooks/3_service/fileserver.yml
@@ -6,6 +6,9 @@
 ---
 - hosts: fileserver
   roles:
-    - { role: mgrote_fileserver_smb, tags: "smb" }
-    - { role: mgrote_youtubedl, tags: "youtubedl" }
-    - { role: mgrote_disable_oom_killer, tags: "oom" }
+    - role: mgrote_fileserver_smb
+      tags: "smb"
+    - role: mgrote_youtubedl
+      tags: "youtubedl"
+    - role: mgrote_disable_oom_killer
+      tags: "oom"
diff --git a/playbooks/3_service/git.yml b/playbooks/3_service/git.yml
index 16ec8122..b04fa2ff 100644
--- a/playbooks/3_service/git.yml
+++ b/playbooks/3_service/git.yml
@@ -1,6 +1,12 @@
 ---
 - hosts: git
   roles:
-    - { role: ansible-role-postgresql, tags: "db", become: true }
-    - { role: ansible_role_gitea, tags: "gitea", become: true }
-    - { role: mgrote_gitea_setup, tags: "setup", become: true }
+    - role: ansible-role-postgresql
+      tags: "db"
+      become: true
+    - role: ansible_role_gitea
+      tags: "gitea"
+      become: true
+    - role: mgrote_gitea_setup
+      tags: "setup"
+      become: true
diff --git a/playbooks/3_service/lldap.yml b/playbooks/3_service/lldap.yml
index c9078006..99f024e4 100644
--- a/playbooks/3_service/lldap.yml
+++ b/playbooks/3_service/lldap.yml
@@ -1,5 +1,9 @@
 ---
 - hosts: ldap
   roles:
-    - { role: ansible-role-postgresql, tags: "db", become: true }
-    - { role: mgrote_lldap, tags: "lldap", become: true }
+    - role: ansible-role-postgresql
+      tags: "db"
+      become: true
+    - role: mgrote_lldap
+      tags: "lldap"
+      become: true
diff --git a/playbooks/3_service/pbs.yml b/playbooks/3_service/pbs.yml
index d4f25e4d..9c3cccb6 100644
--- a/playbooks/3_service/pbs.yml
+++ b/playbooks/3_service/pbs.yml
@@ -1,12 +1,21 @@
 ---
 - hosts: pbs
   roles:
-    - { role: mgrote_zfs_packages, tags: "zfs_packages" }
-    - { role: mgrote_zfs_arc_mem, tags: "zfs_arc_mem" }
-    - { role: mgrote_zfs_manage_datasets, tags: "datasets" }
-    - { role: mgrote_zfs_scrub, tags: "zfs_scrub" }
-    - { role: mgrote_zfs_zed, tags: "zfs_zed" }
-    - { role: mgrote_zfs_sanoid, tags: "sanoid" }
-    - { role: mgrote_smart, tags: "smart" }
-    - { role: mgrote_pbs_users, tags: "pbs_users" }
-    - { role: mgrote_pbs_datastores, tags: "pbs_datastores" }
+    - role: mgrote_zfs_packages
+      tags: "zfs_packages"
+    - role: mgrote_zfs_arc_mem
+      tags: "zfs_arc_mem"
+    - role: mgrote_zfs_manage_datasets
+      tags: "datasets"
+    - role: mgrote_zfs_scrub
+      tags: "zfs_scrub"
+    - role: mgrote_zfs_zed
+      tags: "zfs_zed"
+    - role: mgrote_zfs_sanoid
+      tags: "sanoid"
+    - role: mgrote_smart
+      tags: "smart"
+    - role: mgrote_pbs_users
+      tags: "pbs_users"
+    - role: mgrote_pbs_datastores
+      tags: "pbs_datastores"
diff --git a/playbooks/3_service/pve.yml b/playbooks/3_service/pve.yml
index 2942574e..3e5b3a4d 100644
--- a/playbooks/3_service/pve.yml
+++ b/playbooks/3_service/pve.yml
@@ -1,14 +1,25 @@
 ---
 - hosts: pve
   roles:
-    - { role: mgrote_zfs_packages, tags: "zfs_packages" }
-    - { role: mgrote_zfs_arc_mem, tags: "zfs_arc_mem" }
-    - { role: mgrote_zfs_manage_datasets, tags: "datasets" }
-    - { role: mgrote_zfs_scrub, tags: "zfs_scrub" }
-    - { role: mgrote_zfs_zed, tags: "zfs_zed" }
-    - { role: mgrote_zfs_sanoid, tags: "sanoid" }
-    - { role: mgrote_smart, tags: "smart" }
-    - { role: mgrote_cv4pve_autosnap, tags: "cv4pve" }
-    - { role: mgrote_proxmox_bind_mounts, tags: "bindmounts" }
-    - { role: mgrote_proxmox_lxc_profiles, tags: "lxc-profile" }
-    - { role: mgrote_pbs_pve_integration, tags: "pbs" }
+    - role: mgrote_zfs_packages
+      tags: "zfs_packages"
+    - role: mgrote_zfs_arc_mem
+      tags: "zfs_arc_mem"
+    - role: mgrote_zfs_manage_datasets
+      tags: "datasets"
+    - role: mgrote_zfs_scrub
+      tags: "zfs_scrub"
+    - role: mgrote_zfs_zed
+      tags: "zfs_zed"
+    - role: mgrote_zfs_sanoid
+      tags: "sanoid"
+    - role: mgrote_smart
+      tags: "smart"
+    - role: mgrote_cv4pve_autosnap
+      tags: "cv4pve"
+    - role: mgrote_proxmox_bind_mounts
+      tags: "bindmounts"
+    - role: mgrote_proxmox_lxc_profiles
+      tags: "lxc-profile"
+    - role: mgrote_pbs_pve_integration
+      tags: "pbs"
diff --git a/playbooks/base/ufw.yml b/playbooks/base/ufw.yml
index fc1340b5..0afd9435 100644
--- a/playbooks/base/ufw.yml
+++ b/playbooks/base/ufw.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: all:!pve:!pbs
   roles:
-    - { role: ansible-ufw, # Regeln werden in den Group/Host-Vars gesetzt
-        tags: "ufw",
-        become: true}
+    - role: ansible-ufw # Regeln werden in den Group/Host-Vars gesetzt
+      tags: ufw
+      become: true
diff --git a/playbooks/base/users.yml b/playbooks/base/users.yml
index ad1eca58..f9522646 100644
--- a/playbooks/base/users.yml
+++ b/playbooks/base/users.yml
@@ -2,9 +2,9 @@
 - hosts: all
   roles:
     - role: mgrote_users
-      tags: "user"
+      tags: users
       become: true
     - role: mgrote_user_setup
       tags:
-        - "user_setup"
+        - user_setup
         - dotfiles