diff --git a/topplay.yml b/topplay.yml
index 42bb4fc8266364fb4e75a90e8cd5f223e5fe8d7f..77801ed8ea4441f326ab391a3cec909cc0d0f190 100644
--- a/topplay.yml
+++ b/topplay.yml
@@ -27,6 +27,24 @@
 #  roles:
 #      - { role: slurm-build, slurm_version: 14.11.0, munge_version: 0.5.11 }
 
+- hosts: 'x509_ca'
+  vars:
+  roles:
+  - { role: easy-rsa-CA }
+
+- hosts: 'OpenVPN-Server'
+  vars:
+    x509_ca_server: "{{ groups['x509_ca'][0] }}"
+  roles:
+  - { role: OpenVPN-Server }
+
+- hosts: 'OpenVPN-Client'
+  vars:
+    x509_ca_server: "{{ groups['x509_ca'][0] }}"
+    openvpn_servers: "{{ groups['OpenVPN-Server'] }}"
+  roles:
+  - { role: OpenVPN-Client }
+
 - hosts: ComputeNode
   vars:
     openmpi_version: 1.8.3
@@ -110,3 +128,21 @@
     ldapDomain: "dc=test,dc=massive,dc=org,dc=au"
   roles:
   - { role: ldapserver }
+
+- hosts: '*'
+  roles:
+  - etcHosts
+
+- hosts: '*'
+  vars:
+    slurm_version: 14.11.0
+    munge_version: 0.5.11
+    slurmqueues: 
+      - {name: DEFAULT, group: ComputeNode}
+      - {name: batch, group: ComputeNode}
+      - {name: gpu, group: ComputeNode}
+    slurmctrl: "{{ groups['SubmitHost'][0] }}"
+  roles:
+      - { role: slurm }
+      - { role: test_user }
+