diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 01de0f9..79c2151 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -3,24 +3,3 @@
 ---
 hostname: "{{ inventory_hostname }}"
 timezone: Europe/Copenhagen
-
-users:
-  - name: lab_admin
-    comment: System administrator
-    groups:
-      - sudo
-    ssh_keys:
-      - sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFWZGLov8wPBNxuvnaPK+8vv6wK5hHUVEFzXKsN9QeuBAAAADHNzaDpzYW1zYXB0aQ== ssh:samsapti
-      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf cardno:14 336 332
-
-  - name: ansible
-    comment: Ansible user
-    groups:
-      - sudo
-    ssh_keys:
-      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyAuOqh0vcpLMBa8FFbvrTOgw8N+bcImFzyBspfQDAf ansible
-
-  - name: jump
-    comment: Jump user
-    groups: []
-    ssh_keys: []
diff --git a/group_vars/control_infra/vars.yml b/group_vars/control_infra/vars.yml
new file mode 100644
index 0000000..708738b
--- /dev/null
+++ b/group_vars/control_infra/vars.yml
@@ -0,0 +1,11 @@
+# vim: ft=yaml.ansible
+# code: language=ansible
+---
+users:
+  - name: lab_admin
+    comment: System administrator
+    groups:
+      - sudo
+    ssh_keys:
+      - sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFWZGLov8wPBNxuvnaPK+8vv6wK5hHUVEFzXKsN9QeuBAAAADHNzaDpzYW1zYXB0aQ== ssh:samsapti
+      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf cardno:14 336 332