diff --git a/debian/gitlab.install b/debian/gitlab.install
index dd263c918c..9ef80d91c8 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -46,7 +46,7 @@ spec usr/share/gitlab
 symbol usr/share/gitlab
 vendor usr/share/gitlab
 VERSION usr/share/gitlab
-yarn.lock usr/share/gitlab
+yarn.lock /var/lib/gitlab
 shared var/lib/gitlab
 public var/lib/gitlab
 db var/lib/gitlab
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index a2d64d8b70..bfd83f44e2 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -61,8 +61,9 @@ test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
 #######################################################################
 runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
 truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"
-runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn.lock && \
-truncate -s 0 ${gitlab_data_dir}/yarn.lock"
+# Don't modify yarn.lock until all dependencies are packaged
+#runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn.lock && \
+#truncate -s 0 ${gitlab_data_dir}/yarn.lock"
 runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/yarn-error.log"
 cd ${gitlab_app_root}
 if ! runuser -u ${gitlab_user} -- sh -c 'bundle --local --quiet'; then
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 0320aac422..6884c85548 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -32,7 +32,7 @@ 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/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'
+runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn --frozen-lockfile install'
 
 echo "Precompiling locales..."
 runuser -u ${gitlab_user} -- sh -c 'bundle exec rake gettext:po_to_json'