diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfc8ee227b..fbca03bb7c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
       - run: yarn run downloadsolc_assets
       - run: yarn run downloadsolc_assets_e2e
       - run: ls -la ./apps/remix-ide/src/assets/js/
-      - run: yarn build
+      - run: NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js yarn build
       - run: npx nx build remix-ide-e2e-src-local-plugin
       - run: yarn run build:libs
       - run: mkdir persist && zip -r persist/dist.zip dist
diff --git a/apps/remix-ide/ci/browser_test.sh b/apps/remix-ide/ci/browser_test.sh
index 4921599dc6..e897339492 100755
--- a/apps/remix-ide/ci/browser_test.sh
+++ b/apps/remix-ide/ci/browser_test.sh
@@ -7,7 +7,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 yarn run ganache-cli &
-yarn run serve:e2e &
+yarn run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 yarn run remixd &
 
diff --git a/apps/remix-ide/ci/download_e2e_assets.sh b/apps/remix-ide/ci/download_e2e_assets.sh
index 2c6187f1dd..405a5ad95c 100644
--- a/apps/remix-ide/ci/download_e2e_assets.sh
+++ b/apps/remix-ide/ci/download_e2e_assets.sh
@@ -9,4 +9,6 @@ wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.7.
 wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.4.14+commit.c2215d46.js -O ./apps/remix-ide/src/assets/js/soljson-v0.4.14+commit.c2215d46.js
 wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.6.8+commit.0bbfe453.js -O ./apps/remix-ide/src/assets/js/soljson-v0.6.8+commit.0bbfe453.js
 wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.1+commit.df193b15.js -O ./apps/remix-ide/src/assets/js/soljson-v0.8.1+commit.df193b15.js
-wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.6.8+commit.0bbfe453.js -O ./apps/remix-ide/src/assets/js/soljson-v0.6.8+commit.0bbfe453.js
+wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.6.5+commit.f956cc89.js -O ./apps/remix-ide/src/assets/js/soljson-v0.6.5+commit.f956cc89.js
+wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.6.8-nightly.2020.5.14+commit.a6d0067b.js -O ./apps/remix-ide/src/assets/js/soljson-v0.6.8-nightly.2020.5.14+commit.a6d0067b.js
+wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.6.0-nightly.2019.12.17+commit.d13438ee.js -O ./apps/remix-ide/src/assets/js/soljson-v0.6.0-nightly.2019.12.17+commit.d13438ee.js
diff --git a/apps/remix-ide/ci/flaky.sh b/apps/remix-ide/ci/flaky.sh
index e914b3944c..41e6c69528 100755
--- a/apps/remix-ide/ci/flaky.sh
+++ b/apps/remix-ide/ci/flaky.sh
@@ -19,7 +19,7 @@ echo "$BUILD_ID"
 TEST_EXITCODE=0
 
 yarn run ganache-cli &
-yarn run serve:e2e &
+yarn run serve:production &
 echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' &
 yarn run remixd &
 npx nx serve remix-ide-e2e-src-local-plugin &
diff --git a/package.json b/package.json
index 7836af90dd..68433bc40a 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
     "publish:libs": "yarn run build:libs && lerna publish --skip-git && yarn run bumpVersion:libs",
     "build:e2e": "node apps/remix-ide-e2e/src/buildGroupTests.js && tsc -p apps/remix-ide-e2e/tsconfig.e2e.json",
-    "serve:e2e": "NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js yarn serve:production",
     "watch:e2e": "nodemon",
     "bumpVersion:libs": "gulp & gulp syncLibVersions;",
     "browsertest": "sleep 5 && yarn run nightwatch_local",