diff --git a/.github/workflows/run-javascript-tests.yml b/.github/workflows/run-javascript-tests.yml
index 563533d0b7b..6900f2ea02c 100644
--- a/.github/workflows/run-javascript-tests.yml
+++ b/.github/workflows/run-javascript-tests.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Upgrade yarn
         run: |
-          yarn set version 3.x
+          yarn set version 3
 
       - name: Install Node modules
         run: |
diff --git a/Dockerfile b/Dockerfile
index 695ca93be13..89c242d0d26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ WORKDIR /pgadmin4/web
 
 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
-    yarn set version 3.x && \
+    yarn set version 3 && \
     yarn install && \
     yarn run bundle && \
     rm -rf node_modules \
diff --git a/web/.yarnrc.yml b/web/.yarnrc.yml
index 8bcbbe9d577..fae63bed341 100644
--- a/web/.yarnrc.yml
+++ b/web/.yarnrc.yml
@@ -1,5 +1,9 @@
-nodeLinker: node-modules
 checksumBehavior: update
+
 logFilters:
-    - code: YN0013
-      level: discard
+  - code: YN0013
+    level: discard
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.6.4.cjs
diff --git a/web/package.json b/web/package.json
index 6964c70918c..c9b6c8f39d9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -182,5 +182,5 @@
     "auditpy": "safety check --full-report -i 51668 -i 52495",
     "audit": "yarn run auditjs && yarn run auditpy"
   },
-  "packageManager": "yarn@3.5.0"
+  "packageManager": "yarn@3.6.4"
 }