diff --git a/homeassistant.yml b/homeassistant.yml
index 99ba54a..cafc290 100644
--- a/homeassistant.yml
+++ b/homeassistant.yml
@@ -10,10 +10,6 @@
     tags: homeassistant
   - role: mosquitto
     tags: mosquitto
-  - role: zwavejs2mqtt
-    tags: zwavejs2mqtt
-  - role: zigbee2mqtt
-    tags: zigbee2mqtt
   tasks:
   - name: ensure homeassistant is running
     service:
@@ -23,3 +19,6 @@
     service:
       name: httpd
       state: started
+
+- import_playbook: zwavejs2mqtt.yml
+- import_playbook: zigbee2mqtt.yml
diff --git a/hosts b/hosts
index 69085cb..5fb8afa 100644
--- a/hosts
+++ b/hosts
@@ -143,3 +143,9 @@ matrix0.pyrocufflink.blue
 file0.pyrocufflink.blue
 
 [zezere]
+
+[zigbee2mqtt:children]
+home-assistant
+
+[zwavejs2mqtt:children]
+home-assistant
diff --git a/zigbee2mqtt.yml b/zigbee2mqtt.yml
new file mode 100644
index 0000000..e1b826a
--- /dev/null
+++ b/zigbee2mqtt.yml
@@ -0,0 +1,4 @@
+- hosts: zigbee2mqtt
+  roles:
+  - role: zigbee2mqtt
+    tags: zigbee2mqtt
diff --git a/zwavejs2mqtt.yml b/zwavejs2mqtt.yml
new file mode 100644
index 0000000..ae24e93
--- /dev/null
+++ b/zwavejs2mqtt.yml
@@ -0,0 +1,4 @@
+- hosts: zwavejs2mqtt
+  roles:
+  - role: zwavejs2mqtt
+    tags: zwavejs2mqtt