diff --git a/vdesks-common.yaml b/vdesks-common.yaml
new file mode 100644
index 0000000..c8e83a2
--- /dev/null
+++ b/vdesks-common.yaml
@@ -0,0 +1,6 @@
+---
+
+- hosts: vdesks
+  remote_user: root
+  roles:
+    - role: common
diff --git a/vdesks-desktop.yaml b/vdesks-desktop.yaml
new file mode 100644
index 0000000..89f0202
--- /dev/null
+++ b/vdesks-desktop.yaml
@@ -0,0 +1,10 @@
+---
+
+- hosts: vdesks
+  remote_user: root
+  roles:
+    - role: eralitex_desktop
+    - role: desktop_apps
+    - role: libreoffice
+    - role: atom_editor
+    - role: ansible
diff --git a/vdesks-network.yaml b/vdesks-network.yaml
new file mode 100644
index 0000000..4393e45
--- /dev/null
+++ b/vdesks-network.yaml
@@ -0,0 +1,6 @@
+---
+
+- hosts: vdesks
+  remote_user: root
+  roles:
+    - role: network
diff --git a/vdesks-provisioning.yaml b/vdesks-provisioning.yaml
new file mode 100644
index 0000000..cc18cb8
--- /dev/null
+++ b/vdesks-provisioning.yaml
@@ -0,0 +1,8 @@
+---
+
+- hosts: vdesks:&provisioning
+  remote_user: root
+  gather_facts: false
+  roles:
+    - role: netif
+    - role: virt_provision
diff --git a/vdesks.yaml b/vdesks.yaml
new file mode 100644
index 0000000..599cc6a
--- /dev/null
+++ b/vdesks.yaml
@@ -0,0 +1,24 @@
+---
+
+- hosts: vdesks
+  gather_facts: false
+  roles:
+    - name: staging
+      default_stage: provisioning
+
+- import_playbook: vdesks-provisioning.yaml
+- import_playbook: vdesks-network.yaml
+
+- hosts: vdesks:&provisioning
+  remote_user: root
+  roles:
+    - name: staging
+      next_stage: staging
+
+- import_playbook: vdesks-common.yaml
+
+- hosts: vdesks:&staging
+  remote_user: root
+  roles:
+    - name: staging
+      next_stage: production
diff --git a/vdesks.yml b/vdesks.yml
deleted file mode 100644
index f3dbab3..0000000
--- a/vdesks.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-
-- hosts: vdesks
-  gather_facts: false
-  roles:
-    - name: staging
-      default_stage: provisioning
-
-- hosts: vdesks:&provisioning
-  remote_user: root
-  gather_facts: false
-  roles:
-    - role: netif
-    - role: virt_provision
-    - role: common
-    - name: staging
-      next_stage: staging
-
-- hosts: vdesks
-  remote_user: root
-  roles:
-    - role: common
-    - role: eralitex_desktop
-    - role: desktop_apps
-    - role: libreoffice
-    - role: atom_editor
-    - role: ansible
-  tasks:
-    - name: install packages
-      apt:
-        pkg: "{{item}}"
-      with_items:
-        - thunderbird
-
-- hosts: vdesks:&staging
-  remote_user: root
-  roles:
-    - name: staging
-      next_stage: production
-
-- hosts: vdesks:&recycling
-  remote_user: root
-  gather_facts: false
-  roles:
-    - role: virt
-      virt_state: absent
diff --git a/vpn-common.yml b/vpn-common.yml
new file mode 100644
index 0000000..42bce45
--- /dev/null
+++ b/vpn-common.yml
@@ -0,0 +1,6 @@
+---
+
+- hosts: vpn_servers
+  remote_user: root
+  roles:
+    - role: common
diff --git a/vpn-network.yml b/vpn-network.yml
new file mode 100644
index 0000000..5c649c9
--- /dev/null
+++ b/vpn-network.yml
@@ -0,0 +1,6 @@
+---
+
+- hosts: vpn_servers
+  remote_user: root
+  roles:
+    - role: network
diff --git a/vpn.yaml b/vpn.yaml
new file mode 100644
index 0000000..90d0d87
--- /dev/null
+++ b/vpn.yaml
@@ -0,0 +1,24 @@
+---
+
+- hosts: vpn_servers
+  gather_facts: false
+  roles:
+    - name: staging
+      default_stage: provisioning
+
+- import_playbook: vpn-provisioning.yaml
+- import_playbook: vpn-network.yaml
+
+- hosts: vpn_servers:&provisioning
+  remote_user: root
+  roles:
+    - name: staging
+      next_stage: staging
+
+- import_playbook: vpn-common.yaml
+
+- hosts: vpn_servers:&staging
+  remote_user: root
+  roles:
+    - name: staging
+      next_stage: production
diff --git a/vpn_servers.yml b/vpn_servers.yml
deleted file mode 100644
index 763065c..0000000
--- a/vpn_servers.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-
-- hosts: vpn_servers
-  gather_facts: false
-  roles:
-    - name: staging
-      default_stage: provisioning
-
-- hosts: vpn_servers:&provisioning
-  remote_user: root
-  gather_facts: false
-  roles:
-    - role: netif
-    - role: virt_provision
-    - role: common
-    - name: staging
-      next_stage: staging
-
-- hosts: vpn_servers
-  remote_user: root
-  roles:
-    - role: common
-
-# - hosts: vpn_servers:&staging
-#   remote_user: root
-#   roles:
-#     - name: staging
-#       next_stage: production
-
-# - hosts: vpn_servers:&recycling
-#   remote_user: root
-#   gather_facts: false
-#   roles:
-#     - role: virt
-#       virt_state: absent