diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage
index d881265..c30fe06 100755
--- a/gitlab-ci-git-buildpackage
+++ b/gitlab-ci-git-buildpackage
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ "$CI_COMMIT_REF_NAME" == "upstream" ] ||  [ "$CI_COMMIT_REF_NAME" == "pristine-tar" ]; then
+    echo No builds run on the $CI_COMMIT_REF_NAME branch, exiting
+    exit 0
+fi
+
 set -e
 set -x
 
@@ -18,6 +23,10 @@ git remote -v
 git branch --track pristine-tar origin/pristine-tar || true
 echo "make master branch current for gbp"
 git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
-gbp buildpackage -us -uc
+if [ -z "$CI_COMMIT_TAG" ]; then
+    gbp buildpackage -uc -us --git-debian-branch="$CI_COMMIT_REF_NAME"
+else
+    gbp buildpackage -uc -us
+fi
 
 exec "$@"