diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fd8680202f..8b980e1cae 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,10 +27,6 @@ COPY docker/set_up_stackwalker.sh /tmp/set_up_stackwalker.sh
 RUN /tmp/set_up_stackwalker.sh && \
     rm /tmp/set_up_stackwalker.sh
 
-# Install frontend JS deps
-COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/
-RUN cd /webapp-frontend-deps/ && npm install
-
 # Install Python dependencies
 COPY requirements.txt /app/
 RUN pip install --no-cache-dir --no-deps -r requirements.txt && \
@@ -44,3 +40,7 @@ ENV PYTHONUNBUFFERED=1 \
     CSSMIN_BINARY=/webapp-frontend-deps/node_modules/.bin/cssmin \
     NPM_ROOT_PATH=/webapp-frontend-deps/ \
     NODE_PATH=/webapp-frontend-deps/node_modules/
+
+# Install frontend JS deps
+COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/
+RUN cd /webapp-frontend-deps/ && npm install
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d288eeb563..b2e8f6f126 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,10 +26,6 @@ COPY docker/set_up_stackwalker.sh /tmp/set_up_stackwalker.sh
 RUN /tmp/set_up_stackwalker.sh && \
     rm /tmp/set_up_stackwalker.sh
 
-# Install frontend JS deps
-COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/
-RUN cd /webapp-frontend-deps/ && npm install
-
 COPY --chown=app:app requirements.txt /app/
 RUN pip install --no-cache-dir --no-deps -r requirements.txt && \
     pip check --disable-pip-version-check
@@ -42,6 +38,10 @@ ENV PYTHONUNBUFFERED=1 \
     NPM_ROOT_PATH=/webapp-frontend-deps/ \
     NODE_PATH=/webapp-frontend-deps/node_modules/
 
+# Install frontend JS deps
+COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/
+RUN cd /webapp-frontend-deps/ && npm install
+
 # app should own everything under /app in the container
 USER app
 
diff --git a/justfile b/justfile
index ed5f478b74..49d31ee2fe 100644
--- a/justfile
+++ b/justfile
@@ -13,7 +13,7 @@ _env:
     fi
 
 # Build docker images
-build *args: _env
+build *args='app fakesentry oidcprovider elasticsearch postgresql pubsub memcached gcs-emulator': _env
     docker compose build --progress plain {{args}}
 
 # Set up Postgres, Elasticsearch, local Pub/Sub, and local GCS services.