diff --git a/Make-MinGW.bat b/Make-MinGW.bat
index 66e5e4db0..3ac83e611 100644
--- a/Make-MinGW.bat
+++ b/Make-MinGW.bat
@@ -168,7 +168,7 @@ REM Main function Ends
     ECHO Install Javascript dependencies
     call yarn install
     ECHO Bundle all Javascript
-    call yarn run bundle
+    call yarn run bundle:prod
 
     XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
diff --git a/Make.bat b/Make.bat
index 499ebac25..94fc479a7 100644
--- a/Make.bat
+++ b/Make.bat
@@ -242,7 +242,7 @@ REM Main function Ends
     ECHO Install Javascript dependencies
     call yarn install
     ECHO Bundle all Javascript
-    call yarn run bundle
+    call yarn run bundle:prod
 
     XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
diff --git a/Makefile b/Makefile
index ab1026221..2d1336283 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ install-node:
 	cd web && yarn install
 
 bundle:
-	cd web && yarn run bundle
+	cd web && yarn run bundle:prod
 
 linter:
 	cd web && yarn run linter
diff --git a/pkg/mac/build.sh b/pkg/mac/build.sh
index 870216587..fd2416171 100755
--- a/pkg/mac/build.sh
+++ b/pkg/mac/build.sh
@@ -180,7 +180,7 @@ _complete_bundle() {
 
     pushd $SOURCEDIR/web
         yarn install
-        yarn run bundle
+        yarn run bundle:prod
     popd
 
     # copy the web directory to the bundle as it is required by runtime
diff --git a/pkg/pip/build.sh b/pkg/pip/build.sh
index 4704475a1..80d6df6a4 100755
--- a/pkg/pip/build.sh
+++ b/pkg/pip/build.sh
@@ -58,7 +58,7 @@ do
 done
 
 yarn install
-yarn run bundle
+yarn run bundle:prod
 
 for FILE in `ls -d pgAdmin/static/js/generated/*`
 do
diff --git a/pkg/src/build.sh b/pkg/src/build.sh
index 83c6dc054..7029547c4 100755
--- a/pkg/src/build.sh
+++ b/pkg/src/build.sh
@@ -71,7 +71,7 @@ done
 
 pushd web
     yarn install
-    yarn run bundle
+    yarn run bundle:prod
 
     for FILE in `ls -d pgAdmin/static/js/generated/*`
     do