diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 26f337f..d17295c 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -4,22 +4,27 @@ on:
   pull_request:
     branches: [main]
   push:
-    branches: [main]
+    branches: [main, pnpm-setup]
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2.4.0
+        with:
+          version: 8
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '20'
+          cache: 'pnpm'
 
       - name: Install Dependencies
-        run: npm ci
+        run: pnpm install
 
       - name: Run Tests
-        run: npm test
+        run: pnpm run test
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 2b5c399..ec5924c 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -7,5 +7,6 @@
     "baseUrl": ".",
     "noEmit": false,
     "emitDeclarationOnly": true
-  }
+  },
+  "composite": true
 }
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index 2b5c399..ec5924c 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -7,5 +7,6 @@
     "baseUrl": ".",
     "noEmit": false,
     "emitDeclarationOnly": true
-  }
+  },
+  "composite": true
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index bc12782..49a3033 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -14,6 +14,9 @@
     "paths": {
       "@ai-form-toolkit/*": ["./packages/*/src"],
       "@docs/*": ["./docs/src"]
+    },
+    "atom": {
+      "rewriteTsconfig": true
     }
   }
 }