diff --git a/playbooks/node002.yml b/playbooks/node002.yml
index ea41243..edbaf88 100644
--- a/playbooks/node002.yml
+++ b/playbooks/node002.yml
@@ -2,8 +2,7 @@
 - name: Run roles for node002
   hosts: node002
   roles:
-    - role: common
-      tags: always
+    - role: always
     - role: backup
       tags: backup
     - role: lego
@@ -13,6 +12,8 @@
       vars:
         caddy_ports_extra:
           - 8448:8448
+    - role: watchtower
+      tags: watchtower
 
     - role: authentik
       tags: authentik
@@ -56,8 +57,6 @@
       tags: uptime_kuma
     - role: vikunja
       tags: vikunja
-    - role: watchtower
-      tags: watchtower]
     - role: webhook
       tags: webhook
     - role: woodpecker
diff --git a/playbooks/node003.yml b/playbooks/node003.yml
index 65bda42..bed0e4b 100644
--- a/playbooks/node003.yml
+++ b/playbooks/node003.yml
@@ -2,14 +2,15 @@
 - name: Run roles for node003
   hosts: node003
   roles:
-    - role: common
-      tags: common
+    - role: always
     - role: docker
       tags: common
     - role: backup
       tags: backup
     - role: caddy
       tags: caddy
+    - role: watchtower
+      tags: watchtower
 
     - role: acme_dns
       tags: acme-dns
@@ -19,7 +20,5 @@
       tags: mailcow
     - role: umami
       tags: umami
-    - role: watchtower
-      tags: watchtower
     - role: wiki_js
       tags: wiki_js
diff --git a/roles/common/handlers/main.yml b/roles/always/handlers/main.yml
similarity index 100%
rename from roles/common/handlers/main.yml
rename to roles/always/handlers/main.yml
diff --git a/roles/common/tasks/main.yml b/roles/always/tasks/main.yml
similarity index 100%
rename from roles/common/tasks/main.yml
rename to roles/always/tasks/main.yml