diff --git a/.github/workflows/main-pipeline.yaml b/.github/workflows/main-pipeline.yaml
index a4f2fe54..a790a254 100644
--- a/.github/workflows/main-pipeline.yaml
+++ b/.github/workflows/main-pipeline.yaml
@@ -6,7 +6,7 @@ name: Main Pipeline
 # NX integration and/or other optimizations will happen separately.
 
 on:
-  pull_request_target:
+  pull_request:
 
 jobs:
   setup:
@@ -16,6 +16,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
@@ -45,7 +47,9 @@ jobs:
             lock:
               - 'pnpm-lock.yaml'
 
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -72,6 +76,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
+      - run: pnpm i
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
@@ -91,11 +99,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
-      - uses: actions/cache@v3
+      - run: pnpm i
+
+      - uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-modules-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -110,10 +122,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
+      - run: pnpm i
+
       - uses: actions/cache@v4
         with:
           path: node_modules
@@ -130,11 +146,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
-      - uses: actions/cache@v3
+      - run: pnpm i
+
+      - uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-modules-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -149,10 +169,15 @@ jobs:
     needs: build
     steps:
       - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
+      - run: pnpm i
+
       - uses: actions/cache@v4
         with:
           path: node_modules