diff --git a/Dockerfile b/Dockerfile
index e710c3e38e79b67154f0247ab95806b158c22110..62bda96408a6d99a357300667b9d0a4153ab7379 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,11 +18,20 @@ RUN apt-get install -y libssl-dev
 
 # rest of gitlab requirements
 RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server \
-  libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
-  libreadline-dev npm sudo nodejs-legacy
+  libicu-dev cmake g++ libkrb5-dev golang ed pkg-config libsqlite3-dev \
+  libreadline-dev sudo
+
+# install nodejs
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+RUN apt-get install -y nodejs
 
 # GDK tools
-RUN apt-get install -y net-tools psmisc
+RUN apt-get install -y net-tools psmisc apt-transport-https
+
+# install yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y yarn
 
 # Add GDK user
 RUN useradd --user-group --create-home gdk