diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index c6e16aec97..3d79194f14 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -4,12 +4,6 @@
 
 FROM sharelatex/sharelatex-base:latest
 
-ENV baseDir .
-
-
-# Install app settings files
-# --------------------------
-ADD ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee
 ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
 
 
@@ -19,30 +13,43 @@ RUN git clone https://github.com/overleaf/overleaf.git \
 	--depth 1 /var/www/sharelatex
 
 
-# Install dependencies needed to run configuration scripts
-# --------------------------------------------------------
-ADD ${baseDir}/package.json /var/www/package.json
+# Copy build dependencies
+# -----------------------
 ADD ${baseDir}/git-revision.sh /var/www/git-revision.sh
-RUN cd /var/www && npm install
-
-
-# Replace overleaf/config/services.js with the list of available
-# services in Overleaf Community Edition
-# --------------------------------------------------------------
 ADD ${baseDir}/services.js /var/www/sharelatex/config/services.js
 
 
 # Checkout services
 # -----------------
-RUN cd /var/www/sharelatex && \
-	npm install && grunt install;
-
-
-# install and compile services
+RUN cd /var/www/sharelatex \
+&&    npm install \
+&&    grunt install \
+  \
+# Cleanup not needed artifacts
 # ----------------------------
-RUN bash -c 'cd /var/www/sharelatex && source ./bin/install-services'
-RUN bash -c 'cd /var/www/sharelatex && source ./bin/compile-services'
+&&  rm -rf /root/.cache /root/.npm $(find /tmp/ -mindepth 1 -maxdepth 1) \
+# Stores the version installed for each service
+# ---------------------------------------------
+&&  cd /var/www \
+&&    ./git-revision.sh > revisions.txt \
+  \
+# Cleanup the git history
+# -------------------
+&&  rm -rf $(find /var/www/sharelatex -name .git)
 
+# Install npm dependencies
+# ------------------------
+RUN cd /var/www/sharelatex \
+&&    bash ./bin/install-services \
+  \
+# Cleanup not needed artifacts
+# ----------------------------
+&&  rm -rf /root/.cache /root/.npm $(find /tmp/ -mindepth 1 -maxdepth 1)
+
+# Compile CoffeeScript
+# --------------------
+RUN cd /var/www/sharelatex \
+&&    bash ./bin/compile-services
 
 # Links CLSI sycntex to its default location
 # ------------------------------------------
@@ -69,11 +76,9 @@ ADD ${baseDir}/logrotate/sharelatex /etc/logrotate.d/sharelatex
 # --------------------------------------------------
 COPY ${baseDir}/init_scripts/ /etc/my_init.d/
 
-
-# Stores the version installed for each service
-# ---------------------------------------------
-RUN cd /var/www && ./git-revision.sh > revisions.txt
-
+# Copy app settings files
+# -----------------------
+COPY ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee
 
 # Set Environment Variables
 # --------------------------------
diff --git a/server-ce/package.json b/server-ce/package.json
deleted file mode 100644
index 9a8f125940..0000000000
--- a/server-ce/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "none",
-  "author": "none",
-  "description": "none",
-  "dependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-rename": "0.0.3",
-    "grunt-docker-io": "^0.7.0",
-    "grunt-github-api": "^0.2.3",
-    "simple-git": "1.85.0",
-    "underscore": "^1.8.3"
-  }
-}