diff --git a/group_vars/all/docker.yml b/group_vars/all/docker.yml
new file mode 100644
index 0000000..aa015be
--- /dev/null
+++ b/group_vars/all/docker.yml
@@ -0,0 +1,15 @@
+docker__channel: ["stable"]
+docker__edition: "ce"
+docker__version: ""
+docker__state: "present"
+docker__users: ["{{ default_user }}"]
+docker__daemon_flags:
+  - "-H unix://"
+docker__cron_jobs_prune_flags: "af"
+docker__cron_jobs:
+  - name: "Docker disk clean up"
+    job: "docker system prune -{{ docker__cron_jobs_prune_flags }} > /dev/null 2>&1"
+    schedule: ["0", "0", "*", "*", "0"]
+    cron_file: "docker-disk-clean-up"
+    user: "{{ (docker__users | first) | d('root') }}"
+    state: "present"
diff --git a/group_vars/all/setup.yml b/group_vars/all/setup.yml
new file mode 100644
index 0000000..6ff1791
--- /dev/null
+++ b/group_vars/all/setup.yml
@@ -0,0 +1,11 @@
+# Time
+ntpserver: pool.ntp.org
+timezone: Europe/London
+
+# Email
+dot_forward_email: dtomlinson@panaetius.co.uk
+smtp_hostname: "{{ vault_smtp_hostname }}"
+smtp_port: 25
+smtp_auth_user: "{{ vault_smtp_auth_user }}"
+smtp_auth_pass: "{{ vault_smtp_auth_pass }}"
+smtp_mail_from: "test-server@panaetius.co.uk"
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
new file mode 100644
index 0000000..8610eed
--- /dev/null
+++ b/group_vars/all/vault.yml
@@ -0,0 +1,30 @@
+vault_default_user_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          65616334373032636534383932373465623634363431323863393839663937613838383566383035
+          6133633038623361636630346233643838623533383333300a356332363165376330376236356665
+          37656230373838373038386234326563656637306236383162383866343163623366356631373862
+          6631616666363137620a363835316632313730623534353336303730363964653231336139383961
+          6361
+vault_smtp_hostname: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          38373930343363666238326563663338386232386265663663663732313165613437303663333232
+          6266373339613864386638323436373363623937326130610a373530366237626564303666386364
+          39313063346137373132363331373261653736316662666431636363613338303034623430653033
+          3764613532646232630a373032356364636566376638646162623034623663313263326630306564
+          38323835356437326431323637323432363630653738383936343737333634636662396535383164
+          6334343166613762373130653961663334393335363066643539
+vault_smtp_auth_user: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          66313165326136343630393030366662303639626237376563633035326636343866363933613436
+          3235333533353136333564363134626136326565383866650a343865626363346565336131643832
+          38656463393930376437356634633531656636666266623639663638613563613263356639313939
+          3838356561306466650a623066303265353361633238643161306562336163623436643736653535
+          64646164346366663766366136323661663731393136643238633435643739316531
+vault_smtp_auth_pass: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36336437393838663665383465313432373866656461356635646331396165323132623163343762
+          3031666331323464326538373839373933336130303537350a326538393330303339626565646434
+          36656665313166653534663237633665633434643166633862326136643738636265396439613465
+          3661316235633830640a333939393762303035653632303664623465373431313061643438616363
+          30343535323764636437656431313430663536316132366361666436643732636363666266353162
+          3362343930306564656331643135363264346263663739616637
diff --git a/group_vars/all/vault_all.yml b/group_vars/all/vault_all.yml
deleted file mode 100644
index 1941cb7..0000000
--- a/group_vars/all/vault_all.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-vault_default_user_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          65616334373032636534383932373465623634363431323863393839663937613838383566383035
-          6133633038623361636630346233643838623533383333300a356332363165376330376236356665
-          37656230373838373038386234326563656637306236383162383866343163623366356631373862
-          6631616666363137620a363835316632313730623534353336303730363964653231336139383961
-          6361