diff --git a/Dockerfile b/Dockerfile
index 772d75a7..153ce135 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,9 @@ ARG BUNDLE_WITHOUT
 ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
 RUN bundle install
 
-RUN . $NVM_DIR/nvm.sh && yarn install
+
+COPY package.json yarn.lock /app/
+RUN . $NVM_DIR/nvm.sh && nvm use default && yarn install
 
 # Copy the Rails application into place
 COPY . /app
diff --git a/ci.sh b/ci.sh
index 5857ea38..d8b1887b 100755
--- a/ci.sh
+++ b/ci.sh
@@ -2,6 +2,7 @@
 set -e
 git config --global --add safe.directory /app
 source $NVM_DIR/nvm.sh
+nvm use default
 yarn install
 bundle exec bin/rake assets:precompile
 bundle exec bin/rake db:create