diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index 6b34b98b4f..72ca386b0f 100644
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   GIT_DEPTH: 128
   PB_RESULT: '${CI_PROJECT_DIR}/../${CI_PROJECT_NAME}_${CI_BUILD_REF}_${CI_JOB_NAME}_${CI_JOB_ID}'
   LINTIAN_CMD: eval lintian --no-tag-display-limit --info --display-info --color=auto --display-experimental --pedantic "${PB_RESULT}"/*.changes
-  ORIGTAR_CMD: origtargz --tar-only --download-only
+  ORIGTAR_CMD: origtargz --tar-only
 # PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --pbuildersatisfydepends "/usr/lib/pbuilder/pbuilder-satisfydepends-classic" --buildresult "${PB_RESULT}" --debbuildopts -sa
   PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --buildresult "${PB_RESULT}" --debbuildopts -sa
   EATMYDATA: "yes"
diff --git a/debian/watch b/debian/watch
index 84e2f97938..1d715faf22 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,8 @@
-version=3
-opts=\
+version=4
+opts="\
 repacksuffix=+dfsg,\
 repack,compression=xz,\
 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/ \
-https://gitlab.com/gitlab-org/gitlab-ce/tags .*/gitlab-ce-v(.*).tar.gz
+" https://gitlab.com/gitlab-org/gitlab-ce/tags .*/gitlab-ce-v(\d[\d.]*)\.tar\.bz2