diff --git a/gulpfile.ts b/gulpfile.ts
index 0717d82086..0cdd016fd7 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -92,7 +92,9 @@ gulp.task('build', gulp.parallel(
 
 gulp.task('default', gulp.task('build'));
 
-gulp.watch([
-	'./src/**/*',
-	'!./src/client/**/*'
-], gulp.task('build'));
+gulp.task('watch', () => {
+	gulp.watch([
+		'./src/**/*',
+		'!./src/client/**/*'
+	], { ignoreInitial: false }, gulp.task('build'));
+});
diff --git a/package.json b/package.json
index d805a5fee8..634182f552 100644
--- a/package.json
+++ b/package.json
@@ -11,18 +11,16 @@
 	"private": true,
 	"scripts": {
 		"start": "node ./index.js",
-		"start-product": "cross-env NODE_ENV=production node ./index.js",
 		"init": "npm run migrate",
 		"ormconfig": "node ./built/ormconfig.js",
 		"migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
 		"migrateandstart": "npm run migrate && npm run start",
-		"build": "webpack && gulp build",
-		"build-product": "cross-env NODE_ENV=production webpack && gulp build",
-		"webpack": "webpack",
+		"build": "npm run build-webpack && npm run build-gulp",
+		"build-webpack": "webpack",
+		"build-gulp": "gulp build",
 		"watch": "concurrently \"npm:watch-*\"",
 		"watch-webpack": "webpack --watch",
-		"watch-gulp": "gulp --watch",
-		"gulp": "gulp build",
+		"watch-gulp": "gulp watch",
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",
 		"lint": "tslint 'src/**/*.ts'",