diff --git a/debian/gbp.conf b/debian/gbp.conf
index 107e00fa1bf970495aefdc625cfdd393ef58ffa4..849c17a142df3761a5895b34eae96af8eb3284fe 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = False
-upstream-branch = master
+upstream-branch = release-2.1.x
 
 [git-buildpackage]
 export-dir = ../build-area/
diff --git a/debian/rules b/debian/rules
index d7eb2a51e872039140f6b008b86029ee471ee2ab..329bddc39f39b4d9a721b304905a24f54fe8e9d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ override_dh_auto_install:
 get-orig-source:
 	# Daemon
 	git fetch --all
-	git merge origin master --no-edit
+	git merge origin release-2.1.x --no-edit
 	# Packing
 	@echo "# Packing ... "
 	find . | sort \
diff --git a/ring-daemon.spec b/ring-daemon.spec
index f270847b9b8e9cc15d68ae2820d58d887076eace..546c366048ea7db2edadb262bd4f7016ccb653f7 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -42,10 +42,10 @@ This is the ring repository
 git init
 git remote add origin https://gerrit-ring.savoirfairelinux.com/ring
 git fetch --all
-git checkout packaging -f
+git checkout packaging-releases -f
 git config user.name "joulupukki"
 git config user.email "joulupukki@localhost"
-git merge origin/master --no-edit
+git merge origin/release-2.1.x --no-edit
 # Apply all patches
 for patch_file in $(cat debian/patches/series | grep -v "^#")
 do