diff --git a/debian/gbp.conf b/debian/gbp.conf
index dba526f6..6cb451a4 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -10,5 +10,8 @@ debian-branch = master
 # Directory for performing the build
 export-dir = ./debian-build
 
+# Format for upstream tags
+upstream-tag = %(version)s
+
 # Format for the debian tag
-debian-tag = debian-%(version)s
+debian-tag = debian/%(version)s