diff --git a/debian/copyright b/debian/copyright
index 67ff935533..e56be6731b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Source: https://gitlab.com/gitlab-org/gitlab-foss
 Comment: This package installs front end dependencies (nodejs modules) using
  yarn package manager from outside debian. This can go to main when all
  those nodejs modules are packaged in main.
+Files-Excluded: qa/qa/vendor/one_password/*/op
 
 Files: *
 Copyright: 2011-2015 GitLab B.V.
diff --git a/debian/watch b/debian/watch
index 4b825cb71d..a13212d984 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=4
-opts="\
+opts="repack,compression=xz,repacksuffix=+dfsg,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
 filenamemangle=s/.*v(.*)\/.*/gitlab-$1.tar.gz/,\
 dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \
@@ -12,7 +12,11 @@ opts="pgpmode=none,component=elasticsearch-model" \
 https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-model-(6.1.*).tar.gz ignore
 
 opts="pgpmode=none,component=elasticsearch-rails" \
-https://gemwatch.debian.net/elasticsearch-rails.*/elasticsearch-rails-(6.1.*).tar.gz ignore
+https://gemwatch.debian.net/elasticsearch-rails .*/elasticsearch-rails-(6.1.*).tar.gz ignore
 
 opts="pgpmode=none,component=faraday-middleware-aws-signers-v4" \
 https://gemwatch.debian.net/faraday_middleware-aws-signers-v4 .*/faraday_middleware-aws-signers-v4-(0.1.*).tar.gz ignore
+
+opts="pgpmode=none,component=snowplow-javascript-tracker,\
+filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/snowplow-javascript-tracker-\$1\.tar\.gz/" \
+https://github.com/snowplow/snowplow-javascript-tracker/tags?after=2.11.0-rc3 .*/v?(2.10.0)\.tar\.gz ignore