diff --git a/.forgejo/workflows/publish.yml b/.forgejo/workflows/publish.yml
index 526320f..c528163 100644
--- a/.forgejo/workflows/publish.yml
+++ b/.forgejo/workflows/publish.yml
@@ -18,11 +18,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup environment
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Setup pnpm
         run: |
-          node --version && npm --version
           npm install -g pnpm@${{ env.PNPM_VERSION }}
-          pnpm --version
+          echo "Node: $(node --version)"
+          echo "pnpm: $(pnpm --version)"
 
       - name: Configure npm for Forgejo registry
         run: |
diff --git a/templates/gitlab-ci.yml b/templates/gitlab-ci.yml
index 0185553..50fe9b0 100644
--- a/templates/gitlab-ci.yml
+++ b/templates/gitlab-ci.yml
@@ -11,7 +11,7 @@
 variables:
   PLAYWRIGHT_VERSION: "1.57.0"
   PNPM_VERSION: "8.15.0"
-  NODE_VERSION: "20"
+  NODE_VERSION: "22"
 
 # Base job for E2E tests
 .e2e-base: