diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..cf463228
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:jessie
+MAINTAINER Andrew Woodward awoodward@mirantis.com
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get -y install --fix-missing \
+  curl \
+  ssh \
+  ansible \
+  python-pip
+
+ADD . /vagrant/
+WORKDIR /vagrant
+
+RUN ansible-playbook -i "localhost," -c local main.yml
+
+VOLUME /vagrant
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
index e491bb36..89a5e321 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,7 @@ init_script = <<SCRIPT
 apt-get update
 apt-get -y install python-pip python-dev
 pip install ansible
-ansible-playbook -i "localhost," -c local /vagrant/main.yml
+ansible-playbook -i "localhost," -c local /vagrant/main.yml /vagrant/docker.yml
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/docker.yml b/docker.yml
new file mode 100644
index 00000000..b9254ff4
--- /dev/null
+++ b/docker.yml
@@ -0,0 +1,9 @@
+- hosts: all
+  sudo: yes
+  tasks:
+    - shell: docker --version
+      ignore_errors: true
+      register: docker_version
+    - shell: curl -sSL https://get.docker.com/ | sudo sh
+      when: docker_version | failed
+    - shell: docker pull debian:jessie
diff --git a/openstack.yml b/kolla.yml
similarity index 87%
rename from openstack.yml
rename to kolla.yml
index 7e49c04f..b173cb62 100644
--- a/openstack.yml
+++ b/kolla.yml
@@ -2,7 +2,8 @@
 - hosts: all
   sudo: yes
   tasks:
-    - shell: sh /vagrant/kolla/tools/genenv
+    - git:  repo=https://github.com/stackforge/kolla.git
+    - shell: sh kolla/tools/genenv
     - shell: docker pull {{item}}
       with_items:
         - kollaglue/centos-rdo-glance-registry
diff --git a/main.yml b/main.yml
index 34d1bc73..5328e5b9 100644
--- a/main.yml
+++ b/main.yml
@@ -3,12 +3,6 @@
 - hosts: all
   sudo: yes
   tasks:
-    - shell: docker --version
-      ignore_errors: true
-      register: docker_version
-    - shell: curl -sSL https://get.docker.com/ | sudo sh
-      when: docker_version | failed
-    - shell: docker pull debian:jessie
       # Setup additional development tools
     - apt: name=vim state=present
     - apt: name=tmux state=present