diff --git a/vagrant/centos.sh b/vagrant/centos.sh
index 8c0098a..1d4b86c 100755
--- a/vagrant/centos.sh
+++ b/vagrant/centos.sh
@@ -15,53 +15,16 @@ if [ -n "$http_proxy" ]; then
     fi
 fi
 
-### Install dependencies
-
-yum -y groupinstall "Development tools"
-
-yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python-devel postgresql-server java epel-release
 
-### Install Rabbitmq
-yum install -y rabbitmq-server
-systemctl start rabbitmq-server
-
-### Install Virtualenvwrapper
-which pip2.7 > /dev/null ||
-    curl -s -L https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py |
-        python2.7
-
-if [ ! -f /etc/profile.d/virtualenvwrapper.sh ]
-then
-    pip install virtualenvwrapper
-    cat > "/etc/profile.d/virtualenvwrapper.sh" <<EOF
-export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7"
-source /usr/bin/virtualenvwrapper.sh
-EOF
-fi
-
-### Create conf directory
-mkdir -p /etc/colab
-chown vagrant:vagrant /etc/colab
-
-
-## Configuring postgres
-if [ ! -f /var/lib/pgsql/data/pg_hba.conf.bkp ]; then
-    service postgresql initdb
-    cp /var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/data/pg_hba.conf.bkp
-    echo "local all  all                ident" > /var/lib/pgsql/data/pg_hba.conf
-    echo "host  all  all  127.0.0.1/32  md5" >> /var/lib/pgsql/data/pg_hba.conf
-    echo "host  all  all  ::1/128       md5" >> /var/lib/pgsql/data/pg_hba.conf
-    service postgresql restart
-fi
+### Install dependencies
 
+yum install -y epel-release
 
-### Create colab user in PostgreSQL
-echo "CREATE USER colab WITH PASSWORD 'colab';" | sudo -u postgres -i psql 2> /dev/null || echo
-echo "ALTER USER colab CREATEDB;" | sudo -u postgres -i psql 2> /dev/null
+yum -y groupinstall "Development tools"
 
-### Create colab DB in PostgreSQL
-sudo -u postgres -i createdb --owner=colab colab 2> /dev/null | echo
+yum install -y git unzip gettext libxml2-devel libxslt-devel openssl-devel libffi-devel python-devel python-pip python-virtualenvwrapper rabbitmq-server
 
-### Forcing postgresql to start at boot
-sudo chkconfig postgresql on
 
+### Init Rabbitmq
+chkconfig rabbitmq-server on
+systemctl start rabbitmq-server
diff --git a/vagrant/provision.sh b/vagrant/provision.sh
index a9b8e8a..aff49af 100755
--- a/vagrant/provision.sh
+++ b/vagrant/provision.sh
@@ -31,6 +31,10 @@ for dir in /vagrant/colab /vagrant; do
 done
 pip install -e $basedir
 
+### Create conf directory
+sudo mkdir -p /etc/colab
+sudo chown vagrant:vagrant /etc/colab
+
 if [ ! -s /etc/colab/settings.py ]; then
     colab-init-config > /etc/colab/settings.py
 fi
@@ -41,4 +45,4 @@ colab-admin loaddata /vagrant/tests/test_data.json
 # Init.d Celery files
 sudo cp $basedir/vagrant/misc/etc/init.d/celeryd /etc/init.d/
 sudo cp $basedir/vagrant/misc/etc/default/celeryd /etc/default/
-sudo systemctl start celeryd
+sudo service celeryd start
diff --git a/vagrant/ubuntu.sh b/vagrant/ubuntu.sh
index 4aaab6e..9df2a97 100755
--- a/vagrant/ubuntu.sh
+++ b/vagrant/ubuntu.sh
@@ -5,16 +5,4 @@ set -ex
 ### Install dependencies
 apt-get update
 
-apt-get install curl git unzip mercurial build-essential libev-dev gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev libjpeg-dev zlib1g-dev libfreetype6-dev libpq-dev python-dev postgresql virtualenvwrapper python-pip java-common -y
-
-
-### Create conf directory
-mkdir -p /etc/colab
-chown vagrant:vagrant /etc/colab
-
-### Create colab user in PostgreSQL
-echo "CREATE USER colab WITH PASSWORD 'colab';" | sudo -u postgres -i psql 2> /dev/null || echo
-echo "ALTER USER colab CREATEDB;" | sudo -u postgres -i psql 2> /dev/null
-
-#i## Create colab DB in PostgreSQL
-sudo -u postgres -i createdb --owner=colab colab 2> /dev/null | echo
+apt-get install curl git unzip build-essential gettext libxml2-dev libxslt1-dev libssl-dev libffi-dev python-dev virtualenvwrapper python-pip rabbitmq-server -y
--
libgit2 0.21.2