diff --git a/debian/gbp.conf b/debian/gbp.conf
index 74c1a55..e02f0ca 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,9 @@
 [DEFAULT]
-pristine-tar = True
-debian-branch = debian
+debian-branch = next
+upstream-branch = next
+upstream-tag = tags/v%(version)s
+pristine-tar = False
+
+[dch]
+id-length = 8
+commit-msg = debian/changelog: %(version)s