diff --git a/home.yml b/home.yml
index a4775de..dcc199e 100644
--- a/home.yml
+++ b/home.yml
@@ -4,7 +4,6 @@
 - hosts: localhost
   connection: local
   roles:
-    - common
     - role: desktop
       vars:
         mopidy_spotify_username: !vault |
@@ -37,24 +36,8 @@
                 6265366565363862610a366561373362656637623863336665336562323838643665323461653937
                 38306234316364306134396138376230626630633733306432626637616239373838646433343761
                 3436643661633766616564663937346232353666386531363438
-    - role: user
-      vars:
-        user_username: salt
-        user_password: !vault |
-                $ANSIBLE_VAULT;1.1;AES256
-                37666131343936663962386535343939373161343337383436613961303637376136633736353533
-                3366623536646563383563373265313134663464396231370a303033353661336436386561366139
-                30393536393634653566646636366436656435623534626266343632313336336336346131383361
-                3366343932383930350a383637646261373135376138633533306530306339316235353262356135
-                34626466363266616265653064333365663663306330666632343864373335626265323230633331
-                33623431633665353964623437636231623366383733626266353162633762373035376638663936
-                62383065653836366431316461663862393130653761643937376565366435646665313961663534
-                64303363653631653433343361616635373966326433663466636164613062343561333036613937
-                35616666633737356331653632323639373330396433366639326466373639313630
-      tags: [ user ]
-    - role: zerotier
-      tags: [ zerotier ]
+      tags: [ desktop ]
     - role: ansiblehost
       vars:
         pullplaybook: "home.yml"
-      tags: [ ansiblehost ]
+      tags: [ desktop, ansiblehost ]
diff --git a/site.yml b/site.yml
index 6c2e8b8..a2543b2 100755
--- a/site.yml
+++ b/site.yml
@@ -4,11 +4,11 @@
 - hosts: all
   roles:
     - role: common
-      tags: [ common ]
+      tags: [ always, common ]
+    - role: zerotier
+      tags: [ always, zerotier ]
     - role: influxdb
       tags: [ common ]
-    - role: zerotier
-      tags: [ zerotier ]
     - role: user
       vars:
         user_username: salt