diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index f4f1ef292..984b795c6 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -5,9 +5,13 @@ ENV RUBY_VERSION=2.7.1
 RUN rm /home/gitpod/.rvmrc && touch /home/gitpod/.rvmrc && echo "rvm_gems_path=/home/gitpod/.rvm" > /home/gitpod/.rvmrc
 RUN bash -lc "rvm install ruby-$RUBY_VERSION && rvm use ruby-$RUBY_VERSION --default"
 
-# Install Node
+# Install Node and Yarn
 ENV NODE_VERSION=12.16.3
-RUN bash -lc ". .nvm/nvm.sh && nvm install $NODE_VERSION"
+RUN bash -c ". .nvm/nvm.sh && \
+        nvm install ${NODE_VERSION} && \
+        nvm alias default ${NODE_VERSION} && \
+        npm install -g yarn"
+ENV PATH=/home/gitpod/.nvm/versions/node/v${NODE_VERSION}/bin:$PATH
 
 # Install Redis.
 RUN sudo apt-get update \