diff --git a/debian/control b/debian/control
index 8c75c769f..40cabee5b 100644
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,8 @@ Build-Depends: debhelper-compat (= 12),
                libxxf86vm-dev,
                pkg-config
 Standards-Version: 4.5.0
-Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/debian/master
-Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b debian/master
+Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/ubuntu/focal
+Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b ubuntu/focal
 Homepage: https://monado.freedesktop.org/
 Rules-Requires-Root: no
 
diff --git a/debian/extra/prepare-commit-package.sh b/debian/extra/prepare-commit-package.sh
index cd4bcfe25..f5e9527bf 100755
--- a/debian/extra/prepare-commit-package.sh
+++ b/debian/extra/prepare-commit-package.sh
@@ -22,7 +22,7 @@ set -e
         PKG_REVISION=$2
         export PKG_REVISION
     else
-        PKG_REVISION=1~ci$(date --utc "+%Y%m%d")
+        PKG_REVISION=1~ubuntu20.04~ci$(date --utc "+%Y%m%d")
         export PKG_REVISION
     fi
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1f35dc39b..127fe25a0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = debian/master
+debian-branch = ubuntu/focal
 pristine-tar = True
 upstream-branch = master
diff --git a/debian/rules b/debian/rules
index c2638c289..e9d26aca1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=+all
 # see ENVIRONMENT in dpkg-buildflags(1)
 # package maintainers to append LDFLAGS
 # Not needed on Bullseye and newer
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 
 %: