diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4b6eade..d9115b4 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,14 +1,10 @@
 [DEFAULT]
+debian-branch = kali/master
+debian-tag = kali/%(version)s
 pristine-tar = True
-debian-branch = kali/master
-upstream-branch = upstream
-upstream-vcs-tag = %(version)s
-
-[buildpackage]
-sign-tags = True
-
-[import-orig]
-postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
 
 [pq]
 patch-numbers = False
+
+[dch]
+multimaint-merge = True