diff --git a/vagrant/debian/Vagrantfile b/vagrant/debian/Vagrantfile
index 1dacc7163f75..163ac3e124c7 100644
--- a/vagrant/debian/Vagrantfile
+++ b/vagrant/debian/Vagrantfile
@@ -45,5 +45,5 @@ Vagrant.configure("2") do |config|
 
 
   config.vm.provision "shell", path: "vagrant-setup.sh"
-  #config.vm.provision "shell", path: "vagrant-build.sh"
+  config.vm.provision "shell", path: "vagrant-build.sh", privileged: false
 end
diff --git a/vagrant/debian/vagrant-build.sh b/vagrant/debian/vagrant-build.sh
index 9f827201b608..597c1e1462e1 100755
--- a/vagrant/debian/vagrant-build.sh
+++ b/vagrant/debian/vagrant-build.sh
@@ -1,14 +1,18 @@
 cd /gpdb
-./configure --enable-debug --with-python --with-java --with-libxml --prefix=/usr/local/gpdb
+./configure --enable-debug --with-python --with-perl --enable-mapreduce --with-libxml --prefix=/usr/local/gpdb
 
 make clean
-make -j4  
+make -j 4
 sudo make install
 
 cd /gpdb/gpAux
 cp -rp gpdemo /home/vagrant/
 sudo chown -R vagrant:vagrant /home/vagrant/gpdemo
 cat /home/vagrant/.ssh/id_rsa.pub >> /home/vagrant/.ssh/authorized_keys
+# make sure ssh is not stuck asking if the host is known
+ssh-keyscan -H localhost >> /home/vagrant/.ssh/known_hosts
+ssh-keyscan -H 127.0.0.1 >> /home/vagrant/.ssh/known_hosts
+ssh-keyscan -H debian-jessie >> /home/vagrant/.ssh/known_hosts
 cd /home/vagrant/gpdemo
 source /usr/local/gpdb/greenplum_path.sh
 make cluster
diff --git a/vagrant/debian/vagrant-setup.sh b/vagrant/debian/vagrant-setup.sh
index bd1aca66c768..a754ac8f108c 100755
--- a/vagrant/debian/vagrant-setup.sh
+++ b/vagrant/debian/vagrant-setup.sh
@@ -7,15 +7,24 @@ sudo apt-get install wget
 sudo apt-get -y install docker-engine build-essential libreadline6 \
 libreadline6-dev zlib1g-dev bison flex git-core libcurl4-openssl-dev \
 python-dev libxml2-dev pkg-config vim libbz2-dev  python-pip \
-libapr1-dev libevent-dev
+libapr1-dev libevent-dev libyaml-dev libperl-dev libffi-dev \
+python-setuptools-whl libssl-dev
+
+echo locales locales/locales_to_be_generated multiselect     de_DE ISO-8859-1, de_DE ISO-8859-15, de_DE.UTF-8 UTF-8, de_DE@euro ISO-8859-15, en_GB ISO-8859-1, en_GB ISO-8859-15, en_GB.ISO-8859-15 ISO-8859-15, en_GB.UTF-8 UTF-8, en_US ISO-8859-1, en_US ISO-8859-15, en_US.ISO-8859-15 ISO-8859-15, en_US.UTF-8 UTF-8 | debconf-set-selections
+echo locales locales/default_environment_locale      select  en_US.UTF-8 | debconf-set-selections
+dpkg-reconfigure locales -f noninteractive
+
 
 su vagrant -c "ssh-keygen -t rsa -f .ssh/id_rsa -q -N ''"
 
+pip install --upgrade pip
+pip install cffi --upgrade
 pip install lockfile
-pip install paramiko
-pip install setuptools
+pip install paramiko --upgrade
+pip install setuptools --upgrade
 pip install epydoc
 pip install --pre psutil
+pip install cryptography --upgrade
 
 sudo service docker start
 sudo useradd postgres