diff --git a/ansible/playbooks/nbgw.yml b/ansible/playbooks/nbgw.yml
index 2842365..05efdfa 100644
--- a/ansible/playbooks/nbgw.yml
+++ b/ansible/playbooks/nbgw.yml
@@ -1,13 +1,15 @@
 ---
 - hosts: nbgw
-  vars_files:
-    - ../group_vars/all/vault_common.yml
-    - ../host_vars/nbgw.yml
   roles:
-    - common
+    - role: common
+      vars_files:
+        - ../group_vars/all/vault_common.yml
+      tags: [common]
     - netbird
     - role: pkg
       vars:
         pkgs_to_install: "{{ nbgw.pkgs.install }}"
-    - headscale
+      tags: [pkg]
+    - role: headscale
+      tags: [headscale]
 ...
diff --git a/ansible/playbooks/nebula.yml b/ansible/playbooks/nebula.yml
index dac3a2a..0d1c43f 100644
--- a/ansible/playbooks/nebula.yml
+++ b/ansible/playbooks/nebula.yml
@@ -6,5 +6,7 @@
     - role: user
       vars:
         user: "{{ users.testpcmt }}"
-    - gitea
+      tags: [user]
+    - role: gitea
+      tags: [gitea]
 ...
diff --git a/ansible/playbooks/surtur.yml b/ansible/playbooks/surtur.yml
index 60e813d..09bfbf5 100644
--- a/ansible/playbooks/surtur.yml
+++ b/ansible/playbooks/surtur.yml
@@ -3,12 +3,17 @@
   # connection: local
   vars_files:
     - nothingatall
-    - ../group_vars/all/vault_common.yml
     - ../group_vars/surtur/vault_surtur.yml
   roles:
-    - common
+    - role: common
+      tags: [common]
+      vars_files:
+        - ../group_vars/all/vault_common.yml
     # - rand
-    - configs
-    - flathub
+    - role: configs
+      tags: [configs]
+    - role: flathub
+      tags: [flathub]
     - role: tailscale
       become: true
+      tags: [tailscale]