diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fbaef15f..c7664cc4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,21 +8,22 @@ jobs:
     name: JavaScript Tests
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        name: Install Node
         with:
           node-version: latest
-          cache: pnpm
+      - run: corepack enable
+      - run: pnpm --version
+      - uses: actions/setup-node@v3
+        with:
+          node-version: latest
+          cache: "pnpm"
+          cache-dependency-path: "**/pnpm-lock.yaml"
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile --prefer-offline
       - name: Run Tests
-        run: pnpm run test
+        run: pnpm run test -- --outputTruncateLength=500
   go-test:
     name: Go Tests
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c22eb43..626bea17 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,35 +12,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v3
+        name: Install Node
         with:
-          version: 8
+          node-version: latest
+      - run: corepack enable
+      - run: pnpm --version
       - uses: actions/setup-node@v3
         with:
           node-version: latest
-          cache: pnpm
+          cache: "pnpm"
+          cache-dependency-path: "**/pnpm-lock.yaml"
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile --prefer-offline
       - name: Run Typecheck
         run: pnpm run typecheck
   npm-test:
     name: JavaScript Tests
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        name: Install Node
         with:
           node-version: latest
-          cache: pnpm
+      - run: corepack enable
+      - run: pnpm --version
+      - uses: actions/setup-node@v3
+        with:
+          node-version: latest
+          cache: "pnpm"
+          cache-dependency-path: "**/pnpm-lock.yaml"
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile --prefer-offline
       - name: Run Tests
         run: pnpm run test -- --outputTruncateLength=500
   go-test:
diff --git a/Dockerfile b/Dockerfile
index 7556dcb0..430499a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Build assets
 FROM --platform=$BUILDPLATFORM node:19-alpine as node
 
-RUN npm install -g pnpm
+RUN corepack enable
 
 WORKDIR /build
 
diff --git a/package.json b/package.json
index 7a7a8b4e..21026280 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
  "bugs": {
   "url": "https://github.com/amir20/dozzle/issues"
  },
+ "packageManager": "pnpm@8.1.0",
  "repository": {
   "type": "git",
   "url": "git+https://github.com/amir20/dozzle.git"