diff --git a/debian/gitlab.links b/debian/gitlab.links
index 3a884040e0..9fa78c7daa 100644
--- a/debian/gitlab.links
+++ b/debian/gitlab.links
@@ -3,9 +3,12 @@ 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/yarn.lock usr/share/gitlab/yarn.lock
+var/lib/gitlab/package.json usr/share/gitlab/package.json
 var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log
 var/lib/gitlab/.ssh usr/share/gitlab/.ssh
 var/lib/gitlab/.bundle usr/share/gitlab/.bundle
+var/lib/gitlab/.yarn usr/share/gitlab/.yarn
+var/lib/gitlab/.yarnrc.yml usr/share/gitlab/.yarnrc.yml
 var/lib/gitlab/secrets.yml etc/gitlab/secrets.yml
 var/lib/gitlab/locale usr/share/gitlab/app/assets/javascripts/locale
 usr/share/gitlab/app/assets/javascripts/locale.static/index.js var/lib/gitlab/locale/index.js
diff --git a/debian/patches/0710-use-yarnpkg.patch b/debian/patches/0710-use-yarnpkg.patch
index c4efef3b19..52cce68ff6 100644
--- a/debian/patches/0710-use-yarnpkg.patch
+++ b/debian/patches/0710-use-yarnpkg.patch
@@ -30,7 +30,7 @@ Yarn executable in debian is yarnpkg
    desc 'Install Node dependencies with Yarn'
    task install: ['yarn:available'] do
 -    unless system('yarn install --pure-lockfile --ignore-engines --prefer-offline')
-+    unless system('yarnpkg install --pure-lockfile --ignore-engines --prefer-offline')
++    unless system('yarnpkg install')
        abort 'Error: Unable to install node modules.'.color(:red)
      end
    end
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 271c48bf43..75f8a4a73a 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -36,6 +36,8 @@ 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 'install -d /var/lib/gitlab/.cache'
+runuser -u ${gitlab_user} -- sh -c 'yarnpkg set version berry'
+runuser -u ${gitlab_user} -- sh -c 'if ! grep nodeLinker .yarnrc.yml >/dev/null; then echo "nodeLinker: \"node-modules\"" >>.yarnrc.yml; fi'
 runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
 # Remove write permissions of .yarn-metadata.json files
 runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'