diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9be1ca55e..54c243308 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -7,21 +7,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v1
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       # Get projects set up
       - run: yarn install
@@ -38,9 +27,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
+          cache: yarn
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml
index 6fbc52fcc..c90b468ea 100644
--- a/.github/workflows/Deploy.yml
+++ b/.github/workflows/Deploy.yml
@@ -14,10 +14,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
diff --git a/.github/workflows/DeployExtensionsProd.yml b/.github/workflows/DeployExtensionsProd.yml
index 0dfa3ac14..18c54cdcb 100644
--- a/.github/workflows/DeployExtensionsProd.yml
+++ b/.github/workflows/DeployExtensionsProd.yml
@@ -11,10 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
@@ -28,18 +29,18 @@ jobs:
 
       # To deploy we need isolated node_modules folders which yarn won't do because it is a workspace
       # So, remove the workspace
-      - run: "rm package.json yarn.lock"  # Re-run the  yarn install outside of the workspace
+      - run: "rm package.json yarn.lock" # Re-run the  yarn install outside of the workspace
 
       - run: |
-         cd packages/svelte-vscode
-         yarn install
+          cd packages/svelte-vscode
+          yarn install
 
-         # Just a hard constraint from the vscode marketplace's usage of azure tokens
-         echo "Once a year this expires, tell Orta to access https://dev.azure.com/ortatherox0608/_usersSettings/tokens to get a new one"
+          # Just a hard constraint from the vscode marketplace's usage of azure tokens
+          echo "Once a year this expires, tell Orta to access https://dev.azure.com/ortatherox0608/_usersSettings/tokens to get a new one"
 
-         # Ship it
-         npx vsce publish --yarn -p $VSCE_TOKEN
-         npx ovsx publish --yarn -p $OVSX_TOKEN
+          # Ship it
+          npx vsce publish --yarn -p $VSCE_TOKEN
+          npx ovsx publish --yarn -p $OVSX_TOKEN
 
         env:
           VSCE_TOKEN: ${{ secrets.AZURE_PAN_TOKEN }}
diff --git a/.github/workflows/DeploySvelte2tsxProd.yml b/.github/workflows/DeploySvelte2tsxProd.yml
index 2611cca5a..f18abf32e 100644
--- a/.github/workflows/DeploySvelte2tsxProd.yml
+++ b/.github/workflows/DeploySvelte2tsxProd.yml
@@ -11,10 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
@@ -28,9 +29,9 @@ jobs:
 
       # Ship it
       - run: |
-         cd packages/svelte2tsx
-         npm install
-         npm publish
+          cd packages/svelte2tsx
+          npm install
+          npm publish
 
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/DeploySvelteCheckProd.yml b/.github/workflows/DeploySvelteCheckProd.yml
index 1404b7478..fb480a706 100644
--- a/.github/workflows/DeploySvelteCheckProd.yml
+++ b/.github/workflows/DeploySvelteCheckProd.yml
@@ -11,10 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
@@ -28,9 +29,9 @@ jobs:
 
       # Ship it
       - run: |
-         cd packages/svelte-check
-         npm install
-         npm publish
+          cd packages/svelte-check
+          npm install
+          npm publish
 
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/DeploySvelteLanguageServerProd.yml b/.github/workflows/DeploySvelteLanguageServerProd.yml
index 20dd99619..182f3a818 100644
--- a/.github/workflows/DeploySvelteLanguageServerProd.yml
+++ b/.github/workflows/DeploySvelteLanguageServerProd.yml
@@ -11,10 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
@@ -28,9 +29,9 @@ jobs:
 
       # Ship it
       - run: |
-         cd packages/language-server
-         npm install
-         npm publish
+          cd packages/language-server
+          npm install
+          npm publish
 
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/DeployTypescriptPluginProd.yaml b/.github/workflows/DeployTypescriptPluginProd.yaml
index 02f7f858b..1efdfb930 100644
--- a/.github/workflows/DeployTypescriptPluginProd.yaml
+++ b/.github/workflows/DeployTypescriptPluginProd.yaml
@@ -11,10 +11,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: "12.x"
           registry-url: "https://registry.npmjs.org"
+          cache: yarn
 
       # Ensure everything is compiling
       - run: "yarn install"
@@ -28,9 +29,9 @@ jobs:
 
       # Ship it
       - run: |
-         cd packages/typescript-plugin
-         npm install
-         npm publish
+          cd packages/typescript-plugin
+          npm install
+          npm publish
 
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}