diff --git a/Vagrantfile b/Vagrantfile
index 70b29a2..3c8fb67 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -54,6 +54,7 @@ composer_packages     = [        # List any global Composer packages that you wa
   #"codeception/codeception=*",
   #"phpspec/phpspec:2.0.*@dev",
   #"squizlabs/php_codesniffer:1.5.*",
+  "franzl/studio:dev-master"
 ]
 
 # Default web server document root
diff --git a/scripts/environment.sh b/scripts/environment.sh
index 76904dd..28f636f 100644
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -21,23 +21,20 @@ fi
 cp /vagrant/.env.example /vagrant/.env
 mysql -u root -proot -e 'create database flarum'
 
-### Setup flarum/core ###
-composer global require franzl/studio:dev-master
-cd /vagrant/flarum/core
-git clone https://github.com/flarum/core .
+### Setup flarum/core and install dependencies ###
+cd /vagrant/core
 composer install --prefer-dist
-
-mkdir public
-cd /vagrant/flarum/core/ember/forum
-npm install
-bower install
-cd /vagrant/flarum/core/ember/admin
-npm install
-bower install
-
-### Install main project's dependencies
 cd /vagrant
 composer install --prefer-dist
+composer dump-autoload
+
+mkdir /vagrant/core/public
+cd /vagrant/core/ember/forum
+npm install
+bower install
+cd /vagrant/core/ember/admin
+npm install
+bower install
 
 ### Prepare the database
 php artisan flarum:install