diff --git a/.circleci/config.yml b/.circleci/config.yml
index d865907c91..8bcbed1fca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,10 +29,10 @@ jobs:
 
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - save_cache:
-          key: v1-deps-{{ checksum "package-lock.json" }}
+          key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
       - run: yarn run downloadsolc_assets      
@@ -64,7 +64,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Remix Libs Linting
@@ -91,7 +91,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run: cd dist/libs/remix-tests && yarn install
       - run: yarn run test:libs
@@ -127,7 +127,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Start Selenium
@@ -170,7 +170,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Start Selenium
@@ -213,7 +213,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Start Selenium
@@ -255,7 +255,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Start Selenium
@@ -298,7 +298,7 @@ jobs:
       - run: unzip ./persist/dist.zip
       - restore_cache:
           keys:
-            - v1-deps-{{ checksum "package-lock.json" }}
+            - v1-deps-{{ checksum "yarn.lock" }}
       - run: yarn install
       - run:
           name: Start Selenium
diff --git a/apps/remix-ide/.npmignore b/apps/remix-ide/.npmignore
index 00282f7e0c..6ad8903c48 100644
--- a/apps/remix-ide/.npmignore
+++ b/apps/remix-ide/.npmignore
@@ -3,5 +3,6 @@ node_modules
 reports
 npm-debug.log*
 package-lock.json
+yarn.lock
 remix
 .DS_Store
diff --git a/package.json b/package.json
index e8b1c7fb5b..ec1788e7c2 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js",
     "test-browser": "npm-run-all -lpr selenium make-mock-compiler serve browsertest",
     "watch": "watchify apps/remix-ide/src/index.js -dv -p browserify-reload -o apps/remix-ide/build/app.js --exclude solc",
-    "reinstall": "rm ./node-modules/ -rf && rm package-lock.json && rm ./build/ -rf && yarn install & yarn run build",
+    "reinstall": "rm ./node-modules/ -rf && rm yarn.lock && rm ./build/ -rf && yarn install & yarn run build",
     "ganache-cli": "npx ganache-cli"
   },
   "browserify": {
diff --git a/release-process.md b/release-process.md
index c6ed4e74c3..d0f8e7f9da 100644
--- a/release-process.md
+++ b/release-process.md
@@ -37,7 +37,7 @@ This document includes:
  - git checkout origin/remix_beta
  - git checkout -b bumpVersion
  - update package.json version
- - update version in package-lock.json
+ - update version in yarn.lock
  - merge PR to **origin/remix_beta**
  - git fetch origin remix_beta
  - git checkout origin/remix_beta
@@ -52,7 +52,7 @@ This document includes:
  - git checkout origin/master
  - git checkout -b bumpDevVersion
  - update package.json version: bump the version and add the tag `dev` if not already present.
- - update version in package-lock.json
+ - update version in yarn.lock
  - create a PR and merge it to origin/master
  
 ## Remix IDE release Part 4. remix.ethereum.org update
@@ -73,7 +73,7 @@ This is not strictly speaking a release. Updating the remix site is done through
  - git checkout origin/master
  - git checkout -b bumpVersion
  - update package.json version to the new version "vx.x.x-beta.1"
- - update version in package-lock.json
+ - update version in yarn.lock
  - merge PR
  - git fetch origin master
  - git checkout origin/master