diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59fdea05aab34..f0fa73cfa90fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,11 @@ jobs:
             fi
 
       - restore_cache:
-          key: node-modules-{{ checksum "yarn.lock" }}
+          name: Restore node_modules cache
+          keys:
+            - v1-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - v1-node-{{ arch }}-{{ .Branch }}-
+            - v1-node-{{ arch }}-
 
       - run:
           name: Nodejs Version
@@ -40,6 +44,7 @@ jobs:
           command: ./scripts/circleci/test_entry_point.sh
 
       - save_cache:
-          key: node-modules-{{ checksum "yarn.lock" }}
+          name: Save node_modules cache
+          key: v1-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - node_modules