diff --git a/fabfile.py b/fabfile.py
index de84f5733..a497a6793 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -14,14 +14,13 @@ def deploy():
     fix_file_permissions()
 
 def build_site():
-    local('composer install --no-dev')
-    local('bin/sculpin generate -e prod --clean --no-interaction --quiet')
+    local('composer install --no-dev --optimize-autoloader')
+    local('composer run production')
     local('echo %s > output_prod/version' % env.build_number)
 
 def build_assets():
-    local('yarn --pure-lockfile')
-    local('./node_modules/.bin/bower install')
-    local('./node_modules/.bin/gulp build --production --silent')
+    local('npm run init')
+    local('npm run production')
 
 def deploy_site():
     rsync_project(
@@ -33,5 +32,5 @@ def deploy_site():
     run('sudo service nginx configtest && sudo service nginx reload')
 
 def fix_file_permissions():
-    run('sudo chown -R jarvis:www-data %s/web' % project_root)
+    run('sudo chown -R %s:%s %s/web' % (env.user, env.group, project_root))
     run('sudo chmod -R 750 %s/web' % project_root)
diff --git a/package.json b/package.json
index 1928384e2..9867351f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "init": "yarn && bower install",
+    "init": "yarn --pure-lockfile && bower install",
     "dev": "gulp watch",
     "production": "gulp --production"
   },