diff --git a/Dockerfile b/Dockerfile
index 62ef342..ba3b3e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ COPY ./ /app
 
 WORKDIR /app
 
+RUN rm -rf node_modules/* && make clean
+
 RUN npm install
 
 
@@ -20,8 +22,7 @@ WORKDIR /app
 # The app will run as the 'app' user, and so not have write permissions
 # on any files it doesn't need.
 RUN useradd --user-group --create-home --home-dir /app --shell /bin/false app
-
-RUN [ -e ./install_deps.sh ] && ./install_deps.sh
+RUN ./install_deps.sh
 ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
 
 CMD ["node","app.js"]
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 98715c2..85512cf 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -8,7 +8,7 @@ version: "2"
 services:
   test_unit:
     image: quay.io/sharelatex/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
-    entrypoint: npm run test:unit:_run
+    command: npm run test:unit:_run
 
   test_acceptance:
     build: .
@@ -22,7 +22,7 @@ services:
     depends_on:
       - redis
       - mongo
-    entrypoint: npm run test:acceptance:_run
+    command: npm run test:acceptance:_run
 
   redis:
     image: redis
diff --git a/docker-compose.yml b/docker-compose.yml
index cf90742..1850687 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     volumes:
       - .:/app
     working_dir: /app
-    entrypoint: npm run test:unit
+    command: npm run test:unit
 
   test_acceptance:
     build: .
@@ -27,7 +27,7 @@ services:
     depends_on:
       - redis
       - mongo
-    entrypoint: npm run test:acceptance
+    command: npm run test:acceptance
 
   redis:
     image: redis