diff --git a/playbooks/node001.yml b/playbooks/node001.yml
deleted file mode 100644
index 639b913..0000000
--- a/playbooks/node001.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Run roles for node001
-  hosts: node001
-  roles:
-    - role: common
-      tags: [always]
-    - role: backup
-      tags: [backup]
-    - role: caddy
-      tags: [caddy, reverse-proxy, webserver]
-
-    - role: mailcow
-      tags: [mailcow, mail, communication]
-    - role: minecraft_2
-      tags: [minecraft-2, minecraft, games]
diff --git a/playbooks/node002.yml b/playbooks/node002.yml
index 7754a40..ea41243 100644
--- a/playbooks/node002.yml
+++ b/playbooks/node002.yml
@@ -3,71 +3,62 @@
   hosts: node002
   roles:
     - role: common
-      tags: [always]
+      tags: always
     - role: backup
-      tags: [backup]
+      tags: backup
     - role: lego
-      tags: [lego, certificates]
+      tags: lego
     - role: caddy
-      tags: [caddy, reverse-proxy, webserver]
+      tags: caddy
       vars:
         caddy_ports_extra:
           - 8448:8448
 
-
-    - role: acme_dns
-      tags: [acme-dns, acme_dns, certificates]
     - role: authentik
-      tags: [authentik, authentication]
+      tags: authentik
     - role: extra_services
-      tags: [extra-services]
+      tags: extra_services
     - role: faas
-      tags: [faas]
+      tags: faas
     - role: forgejo
-      tags: [forgejo, git, development]
+      tags: forgejo
     - role: forgejo_runner
-      tags: [forgejo-runner, ci, development]
+      tags: forgejo_runner
     - role: healthcheck
-      tags: [healthcheck, monitoring]
+      tags: healthcheck
     - role: homebox
-      tags: [homebox, inventory]
+      tags: homebox
     - role: immich
-      tags: [immich, gallery]
+      tags: immich
     - role: influxdb
-      tags: [influxdb, sensors, monitoring]
+      tags: influxdb
     - role: jellyfin
-      tags: [jellyfin, media]
-    - role: linkwarden
-      tags: [linkwarden, booksmarks]
+      tags: jellyfin
     - role: minio
-      tags: [minio, storage]
+      tags: minio
     - role: ntfy
-      tags: [ntfy, notifications, push]
+      tags: ntfy
     - role: reitanlage_oranienburg
-      tags: [reitanlage-oranienburg, website]
+      tags: reitanlage_oranienburg
     - role: shlink
-      tags: [shlink, url-shortener]
+      tags: shlink
     - role: synapse
-      tags: [synapse, matrix, communication]
+      tags: synapse
     - role: tandoor
-      tags: [tandoor, recipes]
+      tags: tandoor
     - role: teamspeak_fallback
-      tags: [teamspeak-fallback, communication]
+      tags: teamspeak_fallback
     - role: telegraf
-      tags: [telegraf, monitoring]
+      tags: telegraf
     - role: tinytinyrss
-      tags: [tinytinyrss, news]
-    - role: umami
-      tags: [umami, analytics]
+      tags: tinytinyrss
     - role: uptime_kuma
-      tags: [uptime-kuma, monitoring]
+      tags: uptime_kuma
     - role: vikunja
-      tags: [vikunja, todo]
+      tags: vikunja
     - role: watchtower
-      tags: [watchtower]
+      tags: watchtower]
     - role: webhook
-      tags: [webhook]
-    - role: wiki_js
-      tags: [wiki-js, wiki_js, wiki]
+      tags: webhook
     - role: woodpecker
-      tags: [woodpecker, ci, development]
+      tags: woodpecker
diff --git a/playbooks/node003.yml b/playbooks/node003.yml
index b61bfe2..65bda42 100644
--- a/playbooks/node003.yml
+++ b/playbooks/node003.yml
@@ -3,13 +3,23 @@
   hosts: node003
   roles:
     - role: common
-      tags: [common]
+      tags: common
     - role: docker
-      tags: [common]
+      tags: common
     - role: backup
-      tags: [backup]
+      tags: backup
     - role: caddy
-      tags: [caddy, reverse-proxy, webserver]
+      tags: caddy
 
+    - role: acme_dns
+      tags: acme-dns
+    - role: linkwarden
+      tags: linkwarden
     - role: mailcow
-      tags: [mailcow, mail, communication]
+      tags: mailcow
+    - role: umami
+      tags: umami
+    - role: watchtower
+      tags: watchtower
+    - role: wiki_js
+      tags: wiki_js