diff --git a/Vagrantfile b/Vagrantfile
index 011e6dac..b47088ff 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -61,6 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.box = MASTER_IMAGE
 
     config.vm.provision "shell", inline: solar_script, privileged: true
+    config.vm.provision "shell", inline: "cd /vagrant && docker-compose up -d" , privileged: true
     config.vm.provision "shell", inline: master_pxe, privileged: true unless PREPROVISIONED
     config.vm.provision "file", source: "~/.vagrant.d/insecure_private_key", destination: "/vagrant/tmp/keys/ssh_private"
     config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"
diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml
index 784f1509..e07b0dc9 100644
--- a/bootstrap/playbooks/solar.yaml
+++ b/bootstrap/playbooks/solar.yaml
@@ -6,7 +6,6 @@
     # Setup development env for solar
     - shell: pip install -e . chdir=/vagrant
     - shell: pip install -e . chdir=/vagrant/solard
-    - shell: docker-compose up -d chdir=/vagrant
 
 - hosts: all
   tasks: