diff --git a/build.sh b/build.sh
index e25e4910..bce4ea39 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,9 @@
-echo "1/3 Building frontend..."
 cd client
-gulp prod --api
+npm run build
 rm build/index.html
-echo "2/3 Creating api folder..."
 cd ../server
+composer install
+echo -n > config.php
 mkdir files2
 mv files/.htaccess files2
 rm -rf files/
@@ -14,26 +14,21 @@ cp server/index.php api
 cp server/.htaccess api
 cp server/composer.json api
 cp server/composer.lock api
-cp -R server/controllers api
-cp -R server/data api
-cp -R server/libs api
-cp -R server/models api
-cp -R server/vendor api
-cp -R server/files api
-echo -n > api/config.php
-chmod -R 755 .
-echo "3/3 Generating zip..."
+cp server/controllers api
+cp server/data api
+cp server/libs api
+cp server/models api
+cp server/vendor api
+cp server/files api
+cp server/config.php api
+cp client/src/index.php client/build
 cd client/build
 zip opensupports_dev.zip index.php
 zip -u opensupports_dev.zip .htaccess
-zip -u opensupports_dev.zip css/main.css
-zip -u opensupports_dev.zip js/main.js
-zip -ur opensupports_dev.zip fonts
+zip -u opensupports_dev.zip bundle.js
 zip -ur opensupports_dev.zip images
 mv opensupports_dev.zip ../..
 cd ../..
 zip -ur opensupports_dev.zip api
-rm -rf dist
 mkdir dist
 mv opensupports_dev.zip dist
-rm -rf api