diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e93d1b672..6b27d486f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,10 +32,8 @@ jobs:
           key: v1-deps-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
-      - run: git submodule sync --recursive
-      - run: git submodule update --recursive --init
       - run: npm run downloadsolc_assets
-      - run: npx nx build remix-ide --with-deps
+      - run: npm run build:production
       - run: npx nx build remix-ide-e2e-src-local-plugin
       - run: mkdir persist && zip -r persist/dist.zip dist
       - persist_to_workspace:
diff --git a/apps/remix-ide/ci/browser_tests_chrome_1.sh b/apps/remix-ide/ci/browser_tests_chrome_1.sh
index 50fd4eb256..b8b5e86650 100755
--- a/apps/remix-ide/ci/browser_tests_chrome_1.sh
+++ b/apps/remix-ide/ci/browser_tests_chrome_1.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 npm run ganache-cli &
-npm run serve &
+npm run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 npm run remixd &
 
diff --git a/apps/remix-ide/ci/browser_tests_chrome_2.sh b/apps/remix-ide/ci/browser_tests_chrome_2.sh
index 003578e173..a94ff93f4a 100755
--- a/apps/remix-ide/ci/browser_tests_chrome_2.sh
+++ b/apps/remix-ide/ci/browser_tests_chrome_2.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 npm run ganache-cli &
-npm run serve &
+npm run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 npm run remixd &
 
diff --git a/apps/remix-ide/ci/browser_tests_firefox_1.sh b/apps/remix-ide/ci/browser_tests_firefox_1.sh
index 37c795994e..96eb2ff7fb 100755
--- a/apps/remix-ide/ci/browser_tests_firefox_1.sh
+++ b/apps/remix-ide/ci/browser_tests_firefox_1.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 npm run ganache-cli &
-npm run serve &
+npm run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 npm run remixd &
 
diff --git a/apps/remix-ide/ci/browser_tests_firefox_2.sh b/apps/remix-ide/ci/browser_tests_firefox_2.sh
index 45d6553db3..584459a5c9 100755
--- a/apps/remix-ide/ci/browser_tests_firefox_2.sh
+++ b/apps/remix-ide/ci/browser_tests_firefox_2.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 npm run ganache-cli &
-npm run serve &
+npm run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 npm run remixd &
 
diff --git a/apps/remix-ide/ci/browser_tests_plugin_api.sh b/apps/remix-ide/ci/browser_tests_plugin_api.sh
index 8b3ef4eeb3..f2e1d0454f 100755
--- a/apps/remix-ide/ci/browser_tests_plugin_api.sh
+++ b/apps/remix-ide/ci/browser_tests_plugin_api.sh
@@ -6,7 +6,7 @@ BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
 echo "$BUILD_ID"
 TEST_EXITCODE=0
 
-npm run serve &
+npm run serve:production &
 npx nx serve remix-ide-e2e-src-local-plugin &
 
 sleep 5
diff --git a/apps/remix-ide/ci/browser_tests_run_deploy.sh b/apps/remix-ide/ci/browser_tests_run_deploy.sh
index ce72e10dfc..1a23969cc1 100755
--- a/apps/remix-ide/ci/browser_tests_run_deploy.sh
+++ b/apps/remix-ide/ci/browser_tests_run_deploy.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 npm run ganache-cli &
-npm run serve &
+npm run serve:production &
 
 sleep 5