diff --git a/.github/workflows/auto-approval.yml b/.github/workflows/auto-approval.yml
deleted file mode 100644
index 0e6c8faf0..000000000
--- a/.github/workflows/auto-approval.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: CI/CD
-run-name: Running CI/CD on ${{ github.actor }}'s commits
-
-on:
-  pull_request:
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: auto-approval-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  autoApproval:
-    name: Run auto approval script
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v6
-
-      - name: Setup CI
-        uses: ./.github/composite/setup-ci
-        with:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-
-      - name: Run script
-        shell: bash
-        run: bun run .github/scripts/auto-approval --prId ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --githubToken ${{ secrets.GH_TOKEN }}
diff --git a/email/package.json b/email/package.json
index 9c7ac08ff..7afcdcb1b 100644
--- a/email/package.json
+++ b/email/package.json
@@ -13,6 +13,7 @@
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
     },
+    "packageManager": "pnpm@10.24.0",
     "devDependencies": {
         "@react-email/components": "0.5.1",
         "@react-email/preview-server": "^5",
diff --git a/infra/Dockerfile b/infra/Dockerfile
index b187f10cd..88f324bf1 100644
--- a/infra/Dockerfile
+++ b/infra/Dockerfile
@@ -1,4 +1,4 @@
-FROM mirror.gcr.io/library/node:20 AS frontend-build
+FROM mirror.gcr.io/library/node:22 AS frontend-build
 
 WORKDIR /js
 
@@ -8,7 +8,7 @@ RUN npm i -g corepack@latest
 COPY js/package.json js/pnpm-lock.yaml ./
 COPY js/patches/ ./patches/
 
-RUN corepack enable pnpm && pnpm i --frozen-lockfile
+RUN corepack enable pnpm && corepack use $(node -p "require('./package.json').packageManager") && pnpm i --frozen-lockfile
 
 COPY js/ ./
 
@@ -16,14 +16,14 @@ ARG VITE_STAGING
 ENV VITE_STAGING=${VITE_STAGING}
 RUN pnpm run build
 
-FROM mirror.gcr.io/library/node:20 AS email-build
+FROM mirror.gcr.io/library/node:22 AS email-build
 
 WORKDIR /email
 
 COPY email/package.json email/pnpm-lock.yaml ./
 
 RUN npm i -g corepack@latest
-RUN corepack enable pnpm && pnpm i --frozen-lockfile
+RUN corepack enable pnpm && corepack use $(node -p "require('./package.json').packageManager") && pnpm i --frozen-lockfile
 
 COPY email/ ./