diff --git a/build b/build
index cc07900..2e4f989 100755
--- a/build
+++ b/build
@@ -8,11 +8,11 @@ env/bin/pip install -r requirements.txt --upgrade
 scripts/get-private-data.sh
 
 npm install
-npm run build
+npm run build $@
 
 env/bin/python manage.py collectstatic --noinput
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">> Running Migrations..."
   env/bin/python manage.py migrate
diff --git a/circle.yml b/circle.yml
index 2a14fd7..e951dd3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,10 +5,11 @@ machine:
     DEBUG: true
     DATABASE_URL: sqlite://~/database.db
     EMAIL_BACKEND: django.core.mail.backends.console.EmailBackend
+    BUILD_PRODUCTION: true
 
 dependencies:
   pre:
-    - ./build prod
+    - ./build
   cache_directories:
     - env
 
diff --git a/etc/environments/deployment/env b/etc/environments/deployment/env
index c4728bf..2fe0819 100644
--- a/etc/environments/deployment/env
+++ b/etc/environments/deployment/env
@@ -1,3 +1,4 @@
 DEBUG=false
 DATABASE_URL=sqlite://~/database.db
 EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+BUILD_PRODUCTION=true
diff --git a/scripts/build-js.sh b/scripts/build-js.sh
index 544c4c2..8d819ec 100755
--- a/scripts/build-js.sh
+++ b/scripts/build-js.sh
@@ -2,14 +2,14 @@
 
 set -e
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">>> WARNING: Building in Production Mode!"
 fi
 
 mkdir -p static/build/js/lib
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">> Compressing Libraries..."
   uglifyjs node_modules/bootstrap/dist/js/bootstrap.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/lib/bootstrap.js
@@ -22,7 +22,7 @@ fi
 
 rm -rf static/build/js/lib
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">> Compressing jQuery..."
   uglifyjs node_modules/jquery/dist/jquery.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/jquery.js
@@ -35,7 +35,7 @@ fi
 echo ">> Building Application JS..."
 browserify -t [ babelify --presets [ es2015 react ] ] static/src/js/app.js -o static/build/js/app.js
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">> Compressing Application..."
   uglifyjs static/build/js/app.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/app.js
diff --git a/scripts/build-less.sh b/scripts/build-less.sh
index 5d97287..3eaaef3 100755
--- a/scripts/build-less.sh
+++ b/scripts/build-less.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">>> WARNING: Building in Production Mode!"
 fi
@@ -10,7 +10,7 @@ fi
 echo ">> Building LESS..."
 lessc --silent static/src/less/style.less static/build/css/style.css
 
-if [[ $@ == prod ]]
+if [ $BUILD_PRODUCTION == "true" ]
 then
   echo ">> Compressing LESS..."
   cleancss -d --s0 -o static/build/css/style.css static/build/css/style.css