diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7b6f60c394..b8cecddbb9 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = master
-upstream-branch = upstream
+debian-branch = debian/base
+upstream-branch = master
 pristine-tar = True
 compression = gz