diff --git a/.dockerignore b/.dockerignore
index 5d3830a75cfd..6deb652b9900 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,3 +14,4 @@ frontend/node_modules
 !.yarn/**
 !.yarnrc.yml
 !frontend/.yarn/**
+node_modules
diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml
index fc2f0d8d6528..f46ce91e684c 100644
--- a/frontend/.yarnrc.yml
+++ b/frontend/.yarnrc.yml
@@ -1 +1,2 @@
 yarnPath: .yarn/releases/yarn-4.2.2.cjs
+nodeLinker: node-modules
diff --git a/frontend/check-imports.rc b/frontend/check-imports.rc
index b367a6eaa38e..b0cc4ed54a1c 100755
--- a/frontend/check-imports.rc
+++ b/frontend/check-imports.rc
@@ -1,3 +1,4 @@
+#!/usr/bin/env sh
 if grep -R --include="*.js" --include="*.jsx" --include="*.ts" --include="*.tsx" "from '@mui/icons-material'" src; then
   echo "Prohibited import from '@mui/icons-material' found. Use default imports referencing the file instead of the 
   global package. Example: import Delete from '@mui/icons-material/Delete';'"
diff --git a/scripts/build-frontend-if-needed.sh b/scripts/build-frontend-if-needed.sh
index d42751f11bba..0e0f24c8441a 100755
--- a/scripts/build-frontend-if-needed.sh
+++ b/scripts/build-frontend-if-needed.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 if [ ! -d ./frontend/build ]; then
-    yarn --cwd ./frontend install --immutable && yarn build:frontend;
+    yarn --cwd ./frontend install --immutable && echo "Done installing" && yarn build:frontend;
 fi