diff --git a/group_vars/all.yml b/group_vars/all.yml
new file mode 100644
index 0000000..61af99b
--- /dev/null
+++ b/group_vars/all.yml
@@ -0,0 +1,39 @@
+---
+# interface/innernet parent network name
+network_name: "fsfe"
+# 10.200.0.1 to 10.200.255.254
+# 65,536 usable IP addresses
+network_cidr: "10.200.0.0/16"
+# wiregaurd listening port
+network_listen_port: "51820"
+cidrs:
+  ## humans
+  ## 10.200.16.1 to 10.200.31.254
+  ## 4,096 usable IP addresses
+  - { "parent": "fsfe", "name": "humans", "cidr": "10.200.16.0/20" }
+
+  ### humans > admins
+  ### 10.200.16.1 to 10.200.19.254
+  ### 1,024 usable IP addresses
+  - { "parent": "humans", "name": "admins", "cidr": "10.200.16.0/22" }
+
+  ### humans > others
+  ### 10.200.20.1 to 10.200.23.254
+  ### 1,024 usable IP addresses
+  - { "parent": "humans", "name": "others", "cidr": "10.200.20.0/22" }
+
+  ## machines
+  ## 10.200.64.1 to 10.200.127.254
+  ## with 16,384 usable IP addresses
+  - { "parent": "fsfe", "name": "machines", "cidr": "10.200.64.0/18" }
+
+admin_peers:
+  # humans > admins
+  - { "cidr": "admins", "name": "linus" }
+  - { "cidr": "admins", "name": "max-mehl" }
+  - { "cidr": "admins", "name": "albert" }
+
+peers:
+  # machines
+  - { "cidr": "machines", "name": "meitner" }
+  - { "cidr": "machines", "name": "claus" }
diff --git a/playbook.yml b/playbook.yml
index cbb689a..63c7f42 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -3,49 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 ---
-- hosts: innernet_server
+- hosts: innernet-server
   remote_user: root
-  vars:
-    innernet_version: "1.5.0"
-    # interface/innernet parent network name
-    network_name: "fsfe"
-    # 10.200.0.1 to 10.200.255.254
-    # 65,536 usable IP addresses
-    network_cidr: "10.200.0.0/16"
-    # wiregaurd listening port
-    network_listen_port: "51820"
-    cidrs:
-      ## humans
-      ## 10.200.16.1 to 10.200.31.254
-      ## 4,096 usable IP addresses
-      - { "parent": "fsfe", "name": "humans", "cidr": "10.200.16.0/20" }
-
-      ### humans > admins
-      ### 10.200.16.1 to 10.200.19.254
-      ### 1,024 usable IP addresses
-      - { "parent": "humans", "name": "admins", "cidr": "10.200.16.0/22" }
-
-      ### humans > others
-      ### 10.200.20.1 to 10.200.23.254
-      ### 1,024 usable IP addresses
-      - { "parent": "humans", "name": "others", "cidr": "10.200.20.0/22" }
-
-      ## machines
-      ## 10.200.64.1 to 10.200.127.254
-      ## with 16,384 usable IP addresses
-      - { "parent": "fsfe", "name": "machines", "cidr": "10.200.64.0/18" }
-
-    admin_peers:
-      # humans > admins
-      - { "cidr": "admins", "name": "linus" }
-      - { "cidr": "admins", "name": "max-mehl" }
-      - { "cidr": "admins", "name": "albert" }
-
-    peers:
-      # machines
-      - { "cidr": "machines", "name": "meitner" }
-      - { "cidr": "machines", "name": "claus" }
-
   roles:
-    - role: server
-      tags: [server]
+    - server
+
+- hosts: innernet-client
+  remote_user: root
+  roles:
+    - client