diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 75498f2..ad21965 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -14,11 +14,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 10
-          run_install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -31,7 +26,7 @@ jobs:
           echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
 
       - name: Install dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: npm ci --include=dev --no-frozen-lockfile
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
@@ -41,7 +36,7 @@ jobs:
         run: npm run lint --workspace=apps/website
 
       - name: 🏗️ Build
-        run: pnpm build
+        run: npm run build --workspace=apps/website
 
       # - name: ♿ Accessibility Check
       #   run: npx start-server-and-test start http://localhost:3000 "npm run check:a11y"
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 966110b..a0f1fd2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -161,10 +161,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 10
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -175,12 +171,13 @@ jobs:
           echo "@mintel:registry=https://git.infra.mintel.me/api/packages/mmintel/npm" > .npmrc
           echo "//git.infra.mintel.me/api/packages/mmintel/npm/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
       - name: Install dependencies
+        id: deps
         run: |
-          pnpm store prune
-          pnpm install --no-frozen-lockfile
+          npm cache clean --force
+          npm ci --include=dev --no-frozen-lockfile
 
       - name: 🔒 Security Audit
-        run: pnpm audit --audit-level high || echo "⚠️ Audit found vulnerabilities (non-blocking)"
+        run: npm audit --audit-level high || echo "⚠️ Audit found vulnerabilities (non-blocking)"
       - name: 🧪 QA Checks
         if: github.event.inputs.skip_checks != 'true'
         run: npm run lint --workspaces --if-present
@@ -442,10 +439,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 10
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -457,8 +450,8 @@ jobs:
       - name: Install dependencies
         id: deps
         run: |
-          pnpm store prune
-          pnpm install --no-frozen-lockfile
+          npm cache clean --force
+          npm ci --include=dev --no-frozen-lockfile
       - name: 📦 Cache APT Packages
         uses: actions/cache@v4
         with:
@@ -519,7 +512,7 @@ jobs:
         if: always() && steps.deps.outcome == 'success'
         env:
           TEST_URL: ${{ needs.prepare.outputs.next_public_url }}
-        run: pnpm run check:og
+        run: npm run check:og --workspace=apps/website
       - name: 🌐 Core Smoke Tests (HTTP, API, Locale)
         if: always() && steps.deps.outcome == 'success'
         uses: https://git.infra.mintel.me/mmintel/at-mintel/.gitea/actions/core-smoke-tests@main
@@ -535,7 +528,7 @@ jobs:
       #     NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }}
       #     GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || 'cc2026' }}
       #     PUPPETEER_EXECUTABLE_PATH: /usr/bin/chromium
-      #   run: pnpm run check:forms
+      #   run: npm run check:forms --workspace=apps/website
 
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 7: Notifications
diff --git a/apps/website/app/(payload)/layout.tsx b/apps/website/app/(payload)/layout.tsx
index a6e70fa..9d2524d 100644
--- a/apps/website/app/(payload)/layout.tsx
+++ b/apps/website/app/(payload)/layout.tsx
@@ -10,6 +10,7 @@ type Args = {
     children: React.ReactNode;
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const serverFunction: any = async function (args: any) {
     'use server';
     return handleServerFunctions({