diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c2a8bfcaa..41a00559b9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,9 +53,14 @@ jobs:
                   cache: ${{ runner.os != 'Windows' && 'pnpm' || '' }}
                   node-version: "lts/*"
 
-            - name: Fetch layered build
+            - name: Install Dependencies (Layered)
+              if: ${{ github.ref != 'refs/heads/master' }}
               run: ./scripts/layered.sh
 
+            - name: Install Dependencies (Non layered)
+              if: ${{ github.ref == 'refs/heads/master' }}
+              run: pnpm install --frozen-lockfile
+
             - name: Copy config
               run: cp element.io/develop/config.json config.json
 
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index dec51c2754..bd644a0860 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -25,7 +25,7 @@ jobs:
             matrix:
                 include:
                     - name: Typescript Syntax Check
-                      install: layered
+                      install: ${{ github.ref == 'refs/heads/master' && 'normal' || 'layered' }}
                       command: "lint:types"
                     - name: ESLint
                       install: normal