diff --git a/Dockerfile.www-gitlab-com-2.4 b/Dockerfile.www-gitlab-com-2.4
index a9e8512..f85d945 100644
--- a/Dockerfile.www-gitlab-com-2.4
+++ b/Dockerfile.www-gitlab-com-2.4
@@ -1,16 +1,8 @@
 FROM ruby:2.4-slim
 
-ADD / /
+ADD /scripts/ /scripts/
 RUN /scripts/install-www-gitlab-com
 
-# NodeJS and Yarn
-ARG NODE_INSTALL_VERSION=8.x
-ARG YARN_INSTALL_VERSION=1.2.1-1
-RUN /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
-
-ADD https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
-RUN chmod +x /usr/bin/gitlab-runner-helper
-
 # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
 # Must be set after install-essentials is run
 ENV LANG en_US.UTF-8
diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com
index 42d598c..dfdb878 100755
--- a/scripts/install-www-gitlab-com
+++ b/scripts/install-www-gitlab-com
@@ -5,19 +5,32 @@ IFS=$'\n\t'
 
 export DEBIAN_FRONTEND=noninteractive
 
+# Install LaTeX and pandoc 2.3.1
 apt-get update
 apt-get install -yq --no-install-recommends \
   make gcc g++ locales \
   git-core texlive-latex-recommended texlive-xetex \
-  texlive-fonts-recommended lmodern ed file curl gnupg2
+  texlive-fonts-recommended lmodern ed file curl gnupg2 \
 
-# Install pandoc v2.3.1
 cd /tmp
 curl -L -O https://github.com/jgm/pandoc/releases/download/2.3.1/pandoc-2.3.1-linux.tar.gz
 tar xvf pandoc-2.3.1-linux.tar.gz
 cp pandoc-2.3.1/bin/* /usr/local/bin
 rm -rf /tmp/pandoc*
 
+# For cropping the pictures on the team page
+apt-get install -yq --no-install-recommends imagemagick
+
+# Installing node & yarn
+NODE_INSTALL_VERSION=8.x
+YARN_INSTALL_VERSION=1.2.1-1
+/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
+
+# Installing gitlab-runner
+curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64
+mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
+chmod +x /usr/bin/gitlab-runner-helper
+
 # Set UTF-8
 echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
 locale-gen