diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f76f4a6ae4087..ce48b4fdf0d34 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -149,7 +149,6 @@ jobs:
     - name: Try building micro services
       run: |
         cd ./ee/server/services
-        npm i
         npm run build
         rm -rf dist/
 
@@ -242,7 +241,9 @@ jobs:
       id: cache-nodemodules
       uses: actions/cache@v2
       with:
-        path: node_modules
+        path: |
+          ./node_modules
+          ./ee/server/services/node_modules
         key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
 
     - name: NPM install