diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a73485b..dd5cf2b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,10 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
-          cache: 'pnpm'
+
+      - name: Install Pnpm package manager
+        run: |
+          npm install -g pnpm
 
       - name: Install Dependencies
         run: pnpm install
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2f7e92a8..2bd6c434 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,11 +17,18 @@ jobs:
       - name: Checkout source code.
         uses: actions/checkout@master
 
-      - name: Install NodeJs & Pnpm package manager
-        uses: actions/setup-node@v4
+      - name: Cache node modules
+        uses: actions/cache@v4
         with:
-          node-version: 22
-          cache: 'pnpm'
+          path: node_modules
+          key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.OS }}-build-
+            ${{ runner.OS }}-
+
+      - name: Install pnpm
+        run: |
+          npm install -g pnpm
 
       - name: Create .env file
         run: |