diff --git a/.github/actions/yarn-build/action.yml b/.github/actions/node-build/action.yml
similarity index 67%
rename from .github/actions/yarn-build/action.yml
rename to .github/actions/node-build/action.yml
index 51b0440..07a321f 100644
--- a/.github/actions/yarn-build/action.yml
+++ b/.github/actions/node-build/action.yml
@@ -1,6 +1,6 @@
-name: Build yarn module for release
+name: Build package module for release
 description: |
-  Build yarn module
+  Build package module
 
 inputs:
   repository_dir:
@@ -17,7 +17,11 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Builds yarn module
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9
+    - name: Builds module
       shell: bash
       working-directory: ${{ inputs.repository_dir }}
       env:
@@ -25,10 +29,10 @@ runs:
         IS_DEV: ${{ inputs.is_dev }}
       run: |
         export $(grep -v '^[#|SIGNING|PASS_CORE_POLICY]' $ENV_FILE_PATH | xargs -d '\n')
-        yarn install --frozen-lockfile
+        pnpm install --frozen-lockfile
         if [ "$IS_DEV" == "true" ]; then
-          yarn run build:dev
+          pnpm run build:dev
         else
-          yarn run build
+          pnpm run build
         fi
-        yarn run build:docker
+        pnpm run build:docker
diff --git a/.github/actions/yarn-version/action.yml b/.github/actions/node-version/action.yml
similarity index 55%
rename from .github/actions/yarn-version/action.yml
rename to .github/actions/node-version/action.yml
index 12a9c28..f1d61f3 100644
--- a/.github/actions/yarn-version/action.yml
+++ b/.github/actions/node-version/action.yml
@@ -1,6 +1,6 @@
-name: Update yarn version for release
+name: Update package version for release
 description: |
-  Updates yarn version which automatically does a commit and this action tags
+  Updates package version which automatically does a commit and this action tags
 
 inputs:
   repository_dir:
@@ -14,17 +14,21 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Update yarn version and tag
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9
+    - name: Update version and tag
       shell: bash
       working-directory: ${{ inputs.repository_dir }}
       env:
         SKIP_TAG: ${{ inputs.skip_tag }}
       run: |
-        yarn install --frozen-lockfile
-        yarn config set version-git-tag false
-        yarn version --new-version $RELEASE
+        pnpm install --frozen-lockfile
+        pnpm config set version-git-tag false
+        pnpm version --new-version $RELEASE
         git commit --allow-empty -am "Update version to $RELEASE"
         if [ "$SKIP_TAG" == "false" ]; then
-          echo "Tagging yarn version $RELEASE"
+          echo "Tagging version $RELEASE"
           git tag $RELEASE
         fi
diff --git a/.github/workflows/pass-complete-release.yml b/.github/workflows/pass-complete-release.yml
index 762e6df..e476ca8 100644
--- a/.github/workflows/pass-complete-release.yml
+++ b/.github/workflows/pass-complete-release.yml
@@ -60,10 +60,10 @@ jobs:
           git clone https://${{ secrets.JAVA_RELEASE_PAT }}@github.com/eclipse-pass/pass-acceptance-testing.git combined/pass-acceptance-testing
           git clone https://${{ secrets.JAVA_RELEASE_PAT }}@github.com/eclipse-pass/pass-docker.git combined/pass-docker
 
-      - name: Setup Node & Yarn
-        uses: actions/setup-node@v3
+      - name: Setup Node & pnpm
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Login to GHCR
         uses: docker/login-action@v2
@@ -166,7 +166,7 @@ jobs:
 
       - name: Set Release/commit/tag ~ pass-ui
         if: ${{ ! env.PASS_UI_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-version
+        uses: ./main/.github/actions/node-version
         with:
           repository_dir: combined/pass-ui
         env:
@@ -174,7 +174,7 @@ jobs:
 
       - name: Build Release pass-ui
         if: ${{ ! env.PASS_UI_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-build
+        uses: ./main/.github/actions/node-build
         with:
           repository_dir: combined/pass-ui
           env_path: ../pass-docker/.env
@@ -185,7 +185,7 @@ jobs:
 
       - name: Set Snapshot/commit ~ pass-ui
         if: ${{ ! env.PASS_UI_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-version
+        uses: ./main/.github/actions/node-version
         with:
           repository_dir: combined/pass-ui
           skip_tag: "true"
@@ -194,7 +194,7 @@ jobs:
 
       - name: Build Snapshot pass-ui
         if: ${{ ! env.PASS_UI_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-build
+        uses: ./main/.github/actions/node-build
         with:
           repository_dir: combined/pass-ui
           env_path: ../pass-docker/.env
@@ -217,7 +217,7 @@ jobs:
 
       - name: Set Release/commit/tag ~ pass-acceptance-testing
         if: ${{ ! env.PASS_ACCPT_TEST_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-version
+        uses: ./main/.github/actions/node-version
         with:
           repository_dir: combined/pass-acceptance-testing
         env:
@@ -225,7 +225,7 @@ jobs:
 
       - name: Set Snapshot/commit ~ pass-acceptance-testing
         if: ${{ ! env.PASS_ACCPT_TEST_TAG_EXISTS }}
-        uses: ./main/.github/actions/yarn-version
+        uses: ./main/.github/actions/node-version
         with:
           repository_dir: combined/pass-acceptance-testing
           skip_tag: "true"