diff --git a/.github/workflows/firebase-hosting-deploy.yml b/.github/workflows/firebase-hosting-deploy.yml
index 44e3676..0123682 100644
--- a/.github/workflows/firebase-hosting-deploy.yml
+++ b/.github/workflows/firebase-hosting-deploy.yml
@@ -10,19 +10,14 @@ jobs:
         steps:
             - name: Checkout Repo
               uses: actions/checkout@master
-            - name: Cache node modules
-              uses: actions/cache@v2
-              env:
-                  cache-name: cache-node-modules
+            - name: Setup Node
+              uses: actions/setup-node@v2
               with:
-                  path: "source/node_modules"
-                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('source/yarn.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-build-${{ env.cache-name }}-
-                      ${{ runner.os }}-build-
-                      ${{ runner.os }}-
-            - name: Install Dependencies and Build
-              run: cd source && yarn install && yarn build
+                  node-version: 16
+				          cache: yarn
+                  cache-dependency-path: source/yarn.lock
+            - name: Build
+                  run: cd source && yarn build
             - name: Archive Production Artifact
               uses: actions/upload-artifact@master
               with: