diff --git a/Makefile b/Makefile
index 38e4a324..38e4a449 100644
--- a/Makefile
+++ b/Makefile
@@ -2,51 +2,81 @@ install:
 	npm install
 
 develop:
-	REACT_APP_CLIENT=instat npm start
+	REACT_APP_CLIENT=instat \
+	npm start
 
 clean:
 	rm -rf build
 
 build: clean
-	REACT_APP_ENV=staging REACT_APP_CLIENT=instat npm run build
-
-preproduction-build: clean
-	REACT_APP_ENV=preproduction REACT_APP_CLIENT=instat REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW npm run build
-
-production-build: clean
-	REACT_APP_ENV=production REACT_APP_CLIENT=instat REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW npm run build
+	REACT_APP_TYPE=ott \
+	REACT_APP_ENV=staging \
+	REACT_APP_CLIENT=instat \
+	npm run build
 
 auth-build:
 	rm -rf build_auth
-	REACT_APP_ENV=staging BUILD_PATH=build_auth GENERATE_SOURCEMAP=false npm run build:auth
+
+	REACT_APP_TYPE=auth-service \
+	REACT_APP_ENV=staging \
+	BUILD_PATH=build_auth \
+	GENERATE_SOURCEMAP=false \
+	npm run build:auth
+
 	npx gzipper --verbose build_auth
 
 auth-production-build:
 	rm -rf build_auth
-	REACT_APP_ENV=production BUILD_PATH=build_auth GENERATE_SOURCEMAP=false npm run build:auth
+
+	REACT_APP_TYPE=auth-service \
+	REACT_APP_ENV=production \
+	BUILD_PATH=build_auth \
+	GENERATE_SOURCEMAP=false \
+	npm run build:auth
+
 	npx gzipper --verbose build_auth
 
 facr-build: clean
-	REACT_APP_ENV=staging REACT_APP_CLIENT=facr npm run build
-
-facr-production-build: clean
-	REACT_APP_ENV=production REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW REACT_APP_CLIENT=facr npm run build
+	REACT_APP_TYPE=ott \
+	REACT_APP_ENV=staging \
+	REACT_APP_CLIENT=facr \
+	npm run build
 
 .PHONY: build
 
-prod: production-build
+prod: clean
+	REACT_APP_TYPE=ott \
+	REACT_APP_ENV=production \
+	REACT_APP_CLIENT=instat \
+	REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \
+	npm run build
+
 	rsync -zavP build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/
 	rsync -zavP build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/
 	rsync -zavP build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/wwwroot/
 
-preprod: preproduction-build
+preprod: clean
+	REACT_APP_TYPE=ott \
+	REACT_APP_ENV=preproduction \
+	REACT_APP_CLIENT=instat \
+	REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \
+	npm run build
+
 	rsync -zavP build/ -e 'ssh -p 666' ott-test@test.instat.tv:/usr/local/www/ott-test/wwwroot/
 
-facr-prod: facr-production-build
+facr-prod: clean
+	REACT_APP_TYPE=ott \
+	REACT_APP_ENV=production \
+	REACT_APP_STRIPE_PK=pk_live_ANI76cBhSo69DZUxPmyRVIZW \
+	REACT_APP_CLIENT=facr \
+	npm run build
+
 	rsync -zavP build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/facr-wwwroot/
 	rsync -zavP build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/facr-wwwroot/
 	rsync -zavP build/ -e 'ssh -p 666' ott@bkup.instat.tv:/usr/local/www/ott/facr-wwwroot/
 
+deploy-all: prod preprod facr-prod
+
 stage: build
 	rsync -zavP build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/wwwroot/
 
diff --git a/package.json b/package.json
index d9ac5482..b37ab067 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "storybook": "start-storybook -p 9009 -s public",
     "build-storybook": "build-storybook -s public",
     "start:auth": "REACT_APP_TYPE=auth-service react-scripts start",
-    "build:auth": "REACT_APP_TYPE=auth-service react-scripts build",
     "test:auth": "REACT_APP_TYPE=auth-service react-scripts test"
   },
   "dependencies": {