diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9fa51038e..40e5e6d954 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,16 +9,18 @@ parameters:
     default: false
 orbs:
   browser-tools: circleci/browser-tools@1.4.0
+  node: circleci/node@5.0.2
 jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -26,7 +28,9 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
-
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
@@ -38,22 +42,23 @@ jobs:
       - run: yarn run downloadsolc_assets
       - run: npx nx build remix-ide
       - run: npx nx build remix-ide-e2e-src-local-plugin
-      
+
       - run: yarn run build:libs
       - run: mkdir persist && zip -r persist/dist.zip dist
       - persist_to_workspace:
           root: .
           paths:
-            - 'persist'
+            - "persist"
   lint:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -62,6 +67,9 @@ jobs:
     parallelism: 35
     steps:
       - checkout
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
@@ -72,12 +80,13 @@ jobs:
   remix-libs:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -86,8 +95,11 @@ jobs:
 
     steps:
       - checkout
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -95,16 +107,17 @@ jobs:
       - run: yarn install
       - run: cd dist/libs/remix-tests && yarn install
       - run: yarn run test:libs
-          
+
   remix-ide-chrome:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -113,17 +126,20 @@ jobs:
 
     parallelism: 90
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
           command: |
-              google-chrome --version
-              chromedriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            google-chrome --version
+            chromedriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -142,12 +158,13 @@ jobs:
   flaky-chrome:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -156,17 +173,20 @@ jobs:
 
     parallelism: 80
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
           command: |
-              google-chrome --version
-              chromedriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            google-chrome --version
+            chromedriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -185,12 +205,13 @@ jobs:
   remix-ide-firefox:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -199,17 +220,20 @@ jobs:
 
     parallelism: 90
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-firefox
       - browser-tools/install-geckodriver
       - run:
           command: |
-              firefox --version
-              geckodriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            firefox --version
+            geckodriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -227,12 +251,13 @@ jobs:
   flaky-firefox:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -241,17 +266,20 @@ jobs:
 
     parallelism: 80
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-firefox
       - browser-tools/install-geckodriver
       - run:
           command: |
-              firefox --version
-              geckodriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            firefox --version
+            geckodriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -270,12 +298,13 @@ jobs:
   remix-ide-vyper-plugin:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -283,18 +312,20 @@ jobs:
     working_directory: ~/remix-project
     parallelism: 10
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
           command: |
-              google-chrome --version
-              chromedriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            google-chrome --version
+            chromedriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
-      - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -314,12 +345,13 @@ jobs:
   remix-ide-etherscan-plugin:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -327,18 +359,20 @@ jobs:
     working_directory: ~/remix-project
     parallelism: 10
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
           command: |
-              google-chrome --version
-              chromedriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            google-chrome --version
+            chromedriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
-      - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -354,16 +388,17 @@ jobs:
           path: ./reports/tests
       - store_artifacts:
           path: ./reports/screenshots
-          
+
   remix-ide-plugin-api:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -371,18 +406,20 @@ jobs:
     working_directory: ~/remix-project
     parallelism: 10
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
       - run:
           command: |
-              google-chrome --version
-              chromedriver --version
-              java -jar /usr/local/bin/selenium.jar --version
+            google-chrome --version
+            chromedriver --version
+            java -jar /usr/local/bin/selenium.jar --version
           name: Check install
       - checkout
-      - checkout
       - attach_workspace:
-            at: .
+          at: .
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
@@ -401,12 +438,13 @@ jobs:
   deploy-remix-live:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
@@ -415,26 +453,29 @@ jobs:
     working_directory: ~/remix-project
 
     steps:
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - checkout
       - run: yarn install
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
-      - run: 
+      - run:
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
               ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
             fi
 
-
   deploy-remix-alpha:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # documented at https://circleci.com/docs/2.0/circleci-images/
       # - image: circleci/mongo:3.4.4
     environment:
@@ -448,7 +489,7 @@ jobs:
       - run: yarn install
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
-      - run: 
+      - run:
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
@@ -458,11 +499,12 @@ jobs:
   deploy-remix-beta:
     docker:
       # specify the version you desire here
-      - image: cimg/node:14.17.6-browsers
+      - image: cimg/base:current
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
-    resource_class: xlarge
+    resource_class:
+      xlarge
       # documented at https://circleci.com/docs/2.0/circleci-images/
       # - image: circleci/mongo:3.4.4
     environment:
@@ -473,11 +515,14 @@ jobs:
 
     steps:
       - checkout
+      - node/install:
+          install-yarn: true
+          node-version: "v14.17.6"
       - run: yarn install
       - run: yarn run build:libs
       - run: yarn run downloadsolc_assets
       - run: yarn run build:production
-      - run: 
+      - run:
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "remix_beta" ]; then
@@ -520,7 +565,7 @@ workflows:
       - remix-ide-firefox:
           requires:
             - build
-      - deploy-remix-live:          
+      - deploy-remix-live:
           requires:
             - lint
             - remix-libs
@@ -532,7 +577,7 @@ workflows:
           filters:
             branches:
               only: remix_live
-      - deploy-remix-alpha:          
+      - deploy-remix-alpha:
           requires:
             - lint
             - remix-libs
@@ -544,7 +589,7 @@ workflows:
           filters:
             branches:
               only: master
-      - deploy-remix-beta:          
+      - deploy-remix-beta:
           requires:
             - lint
             - remix-libs
@@ -556,4 +601,3 @@ workflows:
           filters:
             branches:
               only: remix_beta
-