diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
index bd1f8ff29a6b..fb3284060f1d 100644
--- a/.github/workflows/first_startup.yaml
+++ b/.github/workflows/first_startup.yaml
@@ -1,5 +1,7 @@
 name: first startup
 on: [push, pull_request]
+env:
+  YARN_INSTALL_OPTS: --frozen-lockfile
 jobs:
 
   test:
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 6403c7013d8f..62d58238937d 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -6,6 +6,7 @@ env:
   GALAXY_TEST_SELENIUM_REMOTE_PORT: "4444"
   GALAXY_SKIP_CLIENT_BUILD: '0'
   GALAXY_TEST_SELENIUM_RETRIES: 1
+  YARN_INSTALL_OPTS: --frozen-lockfile
 jobs:
   test:
     name: Test
diff --git a/.github/workflows/jest.yaml b/.github/workflows/jest.yaml
index 6a53caeeda17..de1565905883 100644
--- a/.github/workflows/jest.yaml
+++ b/.github/workflows/jest.yaml
@@ -15,7 +15,7 @@ jobs:
     - uses: mvdbeek/gha-yarn-cache@master
       with:
         yarn-lock-file: 'client/yarn.lock'
-    - run: yarn install
+    - run: yarn install --frozen-lockfile
       working-directory: client
     - run: yarn jest
       working-directory: client
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index 20860ec3088c..25e71accb066 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -4,6 +4,7 @@ env:
   GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
   GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
   GALAXY_TEST_SELENIUM_RETRIES: 1
+  YARN_INSTALL_OPTS: --frozen-lockfile
 jobs:
   test:
     name: Test
diff --git a/Makefile b/Makefile
index 68deaab08233..1df57f7a434f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ SLIDESHOW_DIR=$(DOC_SOURCE_DIR)/slideshow
 OPEN_RESOURCE=bash -c 'open $$0 || xdg-open $$0'
 SLIDESHOW_TO_PDF?=bash -c 'docker run --rm -v `pwd`:/cwd astefanutti/decktape /cwd/$$0 /cwd/`dirname $$0`/`basename -s .html $$0`.pdf'
 YARN := $(shell command -v yarn 2> /dev/null)
+YARN_INSTALL_OPTS=--network-timeout 300000 --check-files
 
 all: help
 	@echo "This makefile is used for building Galaxy's JS client, documentation, and drive the release process. A sensible all target is not implemented."
@@ -134,7 +135,7 @@ ifndef YARN
 	@echo "Could not find yarn, which is required to build the Galaxy client.\nTo install yarn, please visit \033[0;34mhttps://yarnpkg.com/en/docs/install\033[0m for instructions, and package information for all platforms.\n"
 	false;
 else
-	cd client && yarn install --network-timeout 300000 --check-files
+	cd client && yarn install $(YARN_INSTALL_OPTS)
 endif
 	
 
diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index ba91a7226fa1..a77323046337 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -19,6 +19,7 @@ REPLACE_PIP=$SET_VENV
 COPY_SAMPLE_FILES=1
 SKIP_CLIENT_BUILD=${GALAXY_SKIP_CLIENT_BUILD:-0}
 NODE_VERSION=${GALAXY_NODE_VERSION:-"$(cat client/.node_version)"}
+YARN_INSTALL_OPTS=${YARN_INSTALL_OPTS:-"--network-timeout 300000 --check-files"}
 
 for arg in "$@"; do
     [ "$arg" = "--skip-eggs" ] && FETCH_WHEELS=0
@@ -258,7 +259,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
     fi
     # Build client
     cd client
-    if yarn install --network-timeout 300000 --check-files; then
+    if yarn install $YARN_INSTALL_OPTS; then
         if ! yarn run build-production-maps; then
             echo "ERROR: Galaxy client build failed. See ./client/README.md for more information, including how to get help."
             exit 1