diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b0f9e3b1f..8db1c5554e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,7 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
+
       - run:
           name: Build
           command: |
@@ -39,6 +40,7 @@ jobs:
           paths:
             - "persist"
 
+
   build-plugin:
       docker:
       - image: cimg/node:14.17.6-browsers
@@ -212,49 +214,13 @@ jobs:
       - store_artifacts:
           path: ./reports/screenshots
 
-  deploy-remix-live:
-    docker:
-      - image: cimg/node:14.17.6-browsers
-
-    resource_class:
-      xlarge
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/*.js dist/apps/remix-ide/assets dist/apps/remix-ide/favicon.ico"
-    working_directory: ~/remix-project
 
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-deps-{{ checksum "yarn.lock" }}
-      - run: yarn
-      - save_cache:
-          key: v1-deps-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-      - run: yarn run downloadsolc_assets
-      - run: yarn run build:production
-      - run:
-          name: Deploy
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
-              ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
-            fi
-
-  deploy-remix-alpha:
+  predeploy:
     docker:
       - image: cimg/node:14.17.6-browsers
-
     resource_class:
       xlarge
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/*.js dist/apps/remix-ide/assets dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
-
     steps:
       - checkout
       - restore_cache:
@@ -265,47 +231,39 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-      - run: yarn run downloadsolc_assets
-      - run: yarn run build:production
-      - run:
-          name: Deploy
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              ./apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh;
-            fi
+      - run: yarn build:production
+      - run: mkdir persist && zip -0 -r persist/predeploy.zip dist
+      - persist_to_workspace:
+          root: .
+          paths:
+            - "persist"
 
-  deploy-remix-beta:
+  deploy-build:
     docker:
       - image: cimg/node:14.17.6-browsers
 
     resource_class:
       xlarge
     environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/*.js dist/apps/remix-ide/assets dist/apps/remix-ide/favicon.ico"
+      COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      COMMIT_AUTHOR: "Circle CI"
+      FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/*.js dist/apps/remix-ide/assets dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
+    parameters:
+      script:
+        type: string
+
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v1-deps-{{ checksum "yarn.lock" }}
-      - run: yarn
-      - save_cache:
-          key: v1-deps-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-      - run: yarn run downloadsolc_assets
-      - run: yarn run build:production
+      - attach_workspace:
+          at: .
+      - run: unzip ./persist/predeploy.zip
       - run:
           name: Deploy
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "remix_beta" ]; then
-              ./apps/remix-ide/ci/deploy_from_travis_remix-beta.sh;
-            fi
+          command: ./apps/remix-ide/ci/deploy_from_travis_remix-<< parameters.script >>.sh;
+    
 workflows:
-  version: 2
   run_flaky_tests:
     when: << pipeline.parameters.run_flaky_tests >>
     jobs:
@@ -364,30 +322,41 @@ workflows:
             - remix-libs
             - remix-ide-browser
             - plugins
-      - deploy-remix-live:
+            
+      - predeploy:
+          filters:
+            branches:
+              only: ['master', 'remix_live', 'remix_beta']
+      - deploy-build:
+          script: "live"
           requires:
             - lint
             - remix-libs
             - remix-ide-browser
             - plugins
+            - predeploy
           filters:
             branches:
               only: remix_live
-      - deploy-remix-alpha:
+      - deploy-build:
+          script: "alpha"
           requires:
             - lint
             - remix-libs
             - remix-ide-browser
             - plugins
+            - predeploy
           filters:
             branches:
               only: master
-      - deploy-remix-beta:
+      - deploy-build:
+          script: "beta"
           requires:
             - lint
             - remix-libs
             - remix-ide-browser
             - plugins
+            - predeploy
           filters:
             branches:
               only: remix_beta