diff --git a/debian/control b/debian/control
index 4a5315abf6..66479edef7 100644
--- a/debian/control
+++ b/debian/control
@@ -232,7 +232,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-webpack-rails (>= 0.9.10~),
 # Many node modules are still in NEW, some are yet to be packaged
 # so we use yarn to downlod those and hence gitlab is in contrib
- yarnpkg,
+ yarnpkg (>= 1.19~),
  ruby-rack-proxy (>= 0.6~),
 #
  ruby-sassc-rails (>= 2.1~),
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index e0538529d9..d65a3f8928 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -33,7 +33,7 @@ echo "Installing node modules..."
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
 runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
 # Remove write permissions of .yarn-metadata.json files
-runuser -u ${gitlab_user} -- sh -c 'find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'
+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 {} \;'
 
 echo "Precompiling locales..."
 runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake gettext:po_to_json'