diff --git a/ahoskingit/config.yaml b/ahoskingit/config.yaml
index 21b699b..57897df 100644
--- a/ahoskingit/config.yaml
+++ b/ahoskingit/config.yaml
@@ -1,10 +1,16 @@
 ---
 vagrants:
   "ubuntu/trusty64": "ubuntu/trusty64"
+<<<<<<< HEAD
   "ubuntu/xenial64": "ubuntu/xenial64"
   "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
 
+=======
+  "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
+ 
+>>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
 hosts:
+    docker: 10.200.200.20
     nextcloud: 10.200.200.2
     grafana: 10.200.200.3
     proxy-home: 10.200.200.4
diff --git a/ahoskingit/dns/.vagrant/machines/default/virtualbox/action_provision b/ahoskingit/dns/.vagrant/machines/default/virtualbox/action_provision
new file mode 100644
index 0000000..d5e83c1
--- /dev/null
+++ b/ahoskingit/dns/.vagrant/machines/default/virtualbox/action_provision
@@ -0,0 +1 @@
+1.5:96c333af-16f3-456c-95f7-92e0aaefa731
\ No newline at end of file
diff --git a/ahoskingit/dns/.vagrant/machines/default/virtualbox/private_key b/ahoskingit/dns/.vagrant/machines/default/virtualbox/private_key
new file mode 100644
index 0000000..cbfefdf
--- /dev/null
+++ b/ahoskingit/dns/.vagrant/machines/default/virtualbox/private_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAvunbWUgBsnLNcRcVLyAsIeF6UIRZ8l29qQx5hzgylL3YwRHV
+fj2YXBePtJS1XqzmEwF+D/rBlVzkBXGEgohLt+S3MNMkiRumHqAKf7lKvDZJehlh
+jDBAZBdb9e5PclbReeb+oEZNMNcAmf44SAfP/9JpsDJV9o4+16FvlWeoOYfJo9Zt
+asodj23coVREvJRzjC536ys/2sgz8yc0nVm3tnG29p7FmGMdVuWY57xTMw1s6el9
+IXD5hGbaT98RZNSWWI2q2IEekeTHZtbucWnJI2X/mx3dNsdrPgih04iEkJIMz4aO
+G6YLE89F4vd219CRtuPgsygzHejhApcU81iQ6wIDAQABAoIBAAljiNUINIUpHi9c
+mj8aDvGPnCtPhvjjYUtqAKQEwIAOIhXEocI2l0KYKgoQcib4y8vNe/yfMVv+GHyo
+C4M73rVpexTcnWRcxruk1T9YxnMhHFXz35c8XD5P48bhdGjEGkMreAQ70NoBCNeJ
+6AyqzbDgETCIGTAp6K9EEi+/zEcf74ehmlKT+zTGL6ZdImk88iYRcLbT6A99kd7c
+Txv7vWurVgz3W8hmW0UcMGf51YFcXFBVqg6t1QRgR1GdzGPQYTKkphQFOM0G0aa1
+O2bGHulTdmPieRQHgnt1MzR76603mUO2i+y5TFhSKt1VzXO17H68edq6a+jk+sfc
+9bb08VkCgYEA+EFMKmw7xc02lTpMlVWSsAkFxuqjKLy4ntXoKO8ANYQ2jx1xc+UT
+fnIzw8uqIr/tLOGGILAJwTO3YNpL674XrmFQtbRWcq9Es+B79fiF9N8VYOEri5MM
+hGBWW5tQp6Rm0lJSqEEqXfBrFlPMuT5sR7hin9gfj8NwtiT6QYIt1kcCgYEAxN6Z
+CgeB47tu7M9CFVwYxHbhTUwZS6r/WarGUNcwLGFaE2k6mo5djAgVZUKnjqMcn0rf
+PUeNh2j3nsyeqe57DvaxvZEy8j1dEE5JpXflNFcweUmlCY62z2/fBQiM/4rs/0ol
+Esnxs9ctmm5PS3+MJWeDMTEc69jZksV8nHvWbj0CgYA8vp2Ic9tcVw5YDV/X2ox+
+DncfaSJrQWJbWzPncDO45JUFB8tO9GqEsiUAb8E9p4C9TqGnNevtHl5skH2rPWRG
+AwHgtDPC9Cf3a6JpWVpNxJhSkEY7bMvPSFNZLvPZUVznccVP7kITolRRrkeVvDR6
+iB95xURTxRq7NukVRmk42QKBgCYLgnW+t6pD2Y7oCrRIBP1KoAWpFCZcWFaCuyp6
+O3QIKDkiF9IwewGJumDEPc9B1FEwTe3wuvgVH+1PS8Y5MQzWPckNm1PW6foxtufE
+QMYZp2N5COzM6KUz0FyPp3fm6B/5uypjXlNL3SM/+BD2CCZeV6sU+6rUUE+d3JP9
+FpZdAoGBAO7OLC9UUC4go3Txrj1RkT2ye3je8sL35m8tdwhkhnsIPWFMNn6oevi/
+YsmXne0OZTBA+ez2DlXPTCQwBdI2b8PcobEkOoA6wY1MeHOAg1wllIvsI2HP2zpw
+sgumQ3gHbuuzqVjVR40lf7+Kp1T6AoNFd2eznWntIak9oPTplzzA
+-----END RSA PRIVATE KEY-----
diff --git a/ahoskingit/dns/.vagrant/machines/default/virtualbox/synced_folders b/ahoskingit/dns/.vagrant/machines/default/virtualbox/synced_folders
new file mode 100644
index 0000000..9ebeec5
--- /dev/null
+++ b/ahoskingit/dns/.vagrant/machines/default/virtualbox/synced_folders
@@ -0,0 +1 @@
+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/home/crimson/projects/orchestration.vagrants/ahoskingit/dns","disabled":false,"__vagrantfile":true}}}
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_provision b/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_provision
new file mode 100644
index 0000000..524cecd
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_provision
@@ -0,0 +1 @@
+1.5:aa2a4c67-c250-4d9a-9181-8f6031f92635
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_set_name b/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_set_name
new file mode 100644
index 0000000..2cbbbaf
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/action_set_name
@@ -0,0 +1 @@
+1488743499
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/creator_uid b/ahoskingit/docker/.vagrant/machines/default/virtualbox/creator_uid
new file mode 100644
index 0000000..e37d32a
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/creator_uid
@@ -0,0 +1 @@
+1000
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/id b/ahoskingit/docker/.vagrant/machines/default/virtualbox/id
new file mode 100644
index 0000000..cccdf7a
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/id
@@ -0,0 +1 @@
+aa2a4c67-c250-4d9a-9181-8f6031f92635
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/index_uuid b/ahoskingit/docker/.vagrant/machines/default/virtualbox/index_uuid
new file mode 100644
index 0000000..22a671d
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/index_uuid
@@ -0,0 +1 @@
+cf1a878aa7a0436fa8e1152ac4531c64
\ No newline at end of file
diff --git a/ahoskingit/docker/.vagrant/machines/default/virtualbox/private_key b/ahoskingit/docker/.vagrant/machines/default/virtualbox/private_key
new file mode 100644
index 0000000..8b54a76
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/machines/default/virtualbox/private_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEA9+ZDsLIatds5HRusRGHYAQOtBDObqZr4BL3SQXDf5W3vhRHx
+lae276YhYHj3/V9pCmYRmdya48xJnhVAD1vqgy2wYCZX0alEkJdz6hTlWQaNt6jK
+xowzHWEw5bjVsjD8H3yOMyTcAMRxYsvzRqcvz8DB0/ZAYQuxoVqyHo69/cMnto1T
+m/aoufB6MC1TJ6xQqN57JMDhg/8a/tEIpZkdsEePY/vtCBuNYM7/zPy+bdEGE8gb
+ACyXpAdDMfu+EQzBUYQg8fE4kYAFDMkNc29VUo4SHLUX8qreo4F6w9eKdFmbt9V2
+QtVQO9zp/dpp/hcD5Iz+tyLQGdLa9iTpSLaVwQIDAQABAoIBAQCykYOg/CqRZOC3
+Pv/QIkreMC+pHyO6AI83myShTxV4xsAKMuq6ypzT8++G9pxsPxYDD5MOKgLIpJdC
+8Du81JEQ/RBXskcAF9Xz8aTlsTej8TyUV1n5u3P2bdQzJfmI6hAy/h3QaXSweNDU
+QeVzt2qRVGBKts+ZGDtT52j26guhhk9UmnXJsjuG00OzGPjhjUuhezQxkqlBboP1
+Q2lIYR3svpJy16OYHADhiXUIyDRwIC/GH7dIuiuufhqaU/0SDteHikhrbYEXElZj
+Ikg0ERVGulslLbqgT63qB/PkQrsgL7c1NEAYgz2yDpsggw/3N6Q0Aqi/fjTuFe9I
+o0XwKOohAoGBAP+uuKQIi2j0HXliSyUhweuCas/93iMqT/Pl7y5nFMZjJgoygZw2
+oiLdsqXRNa5knEYPmoIU7NM83LdVhsCgq8iiYw5aQBVqboL1lUsvP6J/6i8ZpvMO
+ffj0MnWM5XWTbnZNEC7cHIb84IV7jgegmRj0tVpYPIveie617IbVyy/zAoGBAPg1
+Easr852EPIn9Du3NqI5Ijojwy0IfxRM1IK2gX/PLIfVfaJSreTGbkNdYwt6fHF6h
+vvxvmeRfTeWpGYsBsFpNrqxaOvBey9mFITdocnT13mZKMqE8cjtmOIQhAGaun3Jw
+C2ZOoF8akI8dh9vpGUuSv+3vitXuF4ZEMpQ7vkR7AoGBAL1RE+pxYThvOLu+KkHu
+QvYs9QXYxfhnxhej83v6W4mhtHLsfse6NEd4vGTHCeZ9HLFLsG4NLGYktJETRNmw
+nkHK62mfLcAttHJHgSnQbF/YMwB5EAL8gg4qUopzrxtl9O6nlQn9dSoGaACuQbYo
+FfRCjV294+b0+lDEZ8RW3UI9AoGBANmA98i+LS99b+ej4G83Z1u37V/HUvbRDEv2
+pHpCLZNgEJQLVYPid8OnBVgQqkOXvq6Wotxnl73uXj7A3mdXxYh8xnK2Zyu4hn5J
+EYCSgKpJwuh0YMW2SIwQ2bm/ibBxmbwYv4SZpiNxDfi78hAdxlLZeGMzJMCvceHw
+5TnM2MD9AoGBAPJFUMQxtrDsg0JoZ9uGEFHQBy9y1Un1SFSQ74rtRCgXFmCFL7O8
+jVQhRRermNAtlhERf4454lPbqkT8dwRL2mOn1JxV2zUPaOPkZ4hDj3XUa15Cdh3J
+O6HfJTov/jv+0xHjv+o7m+R5DcMu2BzQ+t74kDI5t4nqnTaJU6jb7O/i
+-----END RSA PRIVATE KEY-----
diff --git a/ahoskingit/docker/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory b/ahoskingit/docker/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
new file mode 100644
index 0000000..de7b7ed
--- /dev/null
+++ b/ahoskingit/docker/.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory
@@ -0,0 +1,3 @@
+# Generated by Vagrant
+
+default ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/ahosking/projects/ahoskingit/depos/orchestration.vagrants/ahoskingit/docker/.vagrant/machines/default/virtualbox/private_key'
diff --git a/ahoskingit/docker/Vagrantfile b/ahoskingit/docker/Vagrantfile
new file mode 100644
index 0000000..01b9e7f
--- /dev/null
+++ b/ahoskingit/docker/Vagrantfile
@@ -0,0 +1,20 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.box = "boxcutter/ubuntu1604"
+  config.vm.hostname = "docker"
+  playbook = 'docker'
+  client = 'ahoskingit'
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ['modifyvm', :id, '--memory', '1024']
+  end
+
+  eval(IO.read("../../vagrant.mixin.rb"), binding)
+
+end