diff --git a/Dockerfile b/Dockerfile
index dc7dd465a..903494bb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,5 +43,8 @@ RUN useradd -ms /bin/bash fradrive-env
 USER fradrive-env
 
 ADD . /fradrive-src
+WORKDIR /fradrive-src
 
-ARG FONTAWESOME_NPM_AUTH_TOKEN
\ No newline at end of file
+# pre-build frontend- and backend-dependencies
+RUN make node_modules
+RUN make backend-dependencies
\ No newline at end of file
diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile
index b5c133a15..d404a2775 100644
--- a/docker/fradrive/Dockerfile
+++ b/docker/fradrive/Dockerfile
@@ -4,6 +4,7 @@ USER root
 
 # Install uniworx binary
 WORKDIR /fradrive-src
+# RUN make clean # TODO: to discuss whether to invalidate all caches beforehand
 RUN make bin/uniworx
 
 # Runtime dependencies