diff --git a/Make.bat b/Make.bat
index 5ca7a6fbf..ae30be3fa 100644
--- a/Make.bat
+++ b/Make.bat
@@ -233,6 +233,8 @@ REM Main build sequence Ends
     RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
     ECHO Removing tools...
     RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\web\.yarn" 1> nul 2>&1
     ECHO Removing any existing configurations...
     DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
     DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
index 5944ca654..586aee220 100644
--- a/pkg/linux/build-functions.sh
+++ b/pkg/linux/build-functions.sh
@@ -180,6 +180,8 @@ _build_runtime() {
         yarn plugin import workspace-tools
         yarn workspaces focus --production
 
+        # remove the yarn cache
+        rm -rf .yarn .yarn*
     popd > /dev/null || exit
 
     # Create the icon
@@ -232,7 +234,7 @@ _copy_code() {
     cp "${SOURCEDIR}/pkg/linux/config_distro.py" "${SERVERROOT}/usr/${APP_NAME}/web/"
     cd "${SERVERROOT}/usr/${APP_NAME}/web/" || exit
     rm -f pgadmin4.db config_local.*
-    rm -rf jest.config.js babel.* package.json node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
+    rm -rf jest.config.js babel.* package.json .yarn* yarn* .editorconfig .eslint* node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
     find . -name "tests" -type d -print0 | xargs -0 rm -rf
     find . -name "feature_tests" -type d -print0 | xargs -0 rm -rf
     find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
index 5cca43a0f..454744a56 100644
--- a/pkg/mac/build-functions.sh
+++ b/pkg/mac/build-functions.sh
@@ -62,6 +62,8 @@ _build_runtime() {
         yarn plugin import workspace-tools
         yarn workspaces focus --production
 
+        # remove the yarn cache
+        rm -rf .yarn .yarn*
     popd > /dev/null || exit
 }