diff --git a/.circleci/config.yml b/.circleci/config.yml
index a648679a202..1c51b841236 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,10 +85,6 @@ jobs:
     executor: rsp-large
     steps:
       - checkout
-      - run:
-          name: Clean Yarn cache
-          command: yarn cache clean
-
       - run:
           name: Write npmrc
           command: |
diff --git a/Makefile b/Makefile
index a104e2895b6..9760379367b 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ publish: build
 	yarn publish
 
 publish-nightly: build
+	git update-index --refresh
 	yarn version:nightly
 	yarn publish:nightly