diff --git a/debian/gitlab.links b/debian/gitlab.links
index 2d00cb523e..45e8199a5f 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -1,7 +1,7 @@
 var/lib/gitlab/public usr/share/gitlab/public
 var/lib/gitlab/shared usr/share/gitlab/shared
 var/lib/gitlab/db usr/share/gitlab/db
-var/lib/gitlab/node_modules usr/share/gitlab/node_modules
+var/lib/gitlab/.node_modules usr/share/gitlab/node_modules
 var/lib/gitlab/yarn.lock usr/share/gitlab/yarn.lock
 var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log
 var/lib/gitlab/.ssh usr/share/gitlab/.ssh
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 4971d81342..78f991e27e 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -29,9 +29,10 @@ runuser -u ${gitlab_user} -- sh -c 'bundle exec rake db:migrate'
 chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 
 echo "Installing node modules..."
-runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules'
-runuser -u ${gitlab_user} -- sh -c 'npm install yarn ajv-keywords@2.1.1'
-runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/yarn install'
+runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
+runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/yarn'
+runuser -u ${gitlab_user} -- sh -c 'cd /var/lib/gitlab/yarn; npm install yarn'
+runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn install'
 
 echo "Precompiling locales..."
 runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json'