diff --git a/playbooks/desktop.yml b/playbooks/desktop.yml
index 2aeb9c6..3ed299c 100755
--- a/playbooks/desktop.yml
+++ b/playbooks/desktop.yml
@@ -25,8 +25,6 @@
       tags: [ desktop, udev ]
     - role: pulseaudio
       tags: [ desktop, pulse, pulseaudio ]
-    - role: zerotier
-      tags: [ desktop, zerotier ]
 - hosts: lap-s76-lemp9-0.desu.ltd
   roles:
     - role: desktop
diff --git a/playbooks/pis.yml b/playbooks/pis.yml
index acb8fa5..fb1ac39 100755
--- a/playbooks/pis.yml
+++ b/playbooks/pis.yml
@@ -3,9 +3,6 @@
 ---
 # General configuration
 - hosts: tags_pis
-  roles:
-    - role: zerotier
-      tags: [ pis, zerotier ]
   tasks:
     - name: install basic packages
       apt:
diff --git a/playbooks/zerotier.yml b/playbooks/zerotier.yml
new file mode 100755
index 0000000..bf6eb1e
--- /dev/null
+++ b/playbooks/zerotier.yml
@@ -0,0 +1,15 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: tags_zerotier
+  roles:
+    - role: zerotier
+      tags: [ zerotier ]
+- hosts: all
+  tasks:
+    - name: disable zerotier when not tagged
+      systemd: name={{ item }} state=stopped enabled=no
+      with_items:
+        - zerotier-one.service
+      when: "'tags_zerotier' not in group_names and item in services"
+      tags: [ zerotier ]