diff -Nru webhook-2.8.0/debian/changelog webhook-2.8.0/debian/changelog
--- webhook-2.8.0/debian/changelog	2021-09-25 10:40:34.000000000 +0000
+++ webhook-2.8.0/debian/changelog	2022-05-24 19:25:32.000000000 +0000
@@ -1,3 +1,16 @@
+webhook (2.8.0-4) unstable; urgency=medium
+
+  [ Free Ekanayaka ]
+  * Disable gbp's pristine-tar option, use origtargz instead
+  * Switch to DEP14 branch naming
+  * Build depend on debehlper-compat instead of debhelper
+  * Use wrap-and-sort to format control files
+
+  [ Aloïs Micard ]
+  * Update debian/gitlab-ci.yml (using pkg-go-tools/ci-config)
+
+ -- Free Ekanayaka <freee@debian.org>  Tue, 24 May 2022 19:25:32 +0000
+
 webhook (2.8.0-3) unstable; urgency=medium
 
   * Source only upload for migration to testing
diff -Nru webhook-2.8.0/debian/compat webhook-2.8.0/debian/compat
--- webhook-2.8.0/debian/compat	2021-09-22 09:48:21.000000000 +0000
+++ webhook-2.8.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-13
diff -Nru webhook-2.8.0/debian/control webhook-2.8.0/debian/control
--- webhook-2.8.0/debian/control	2021-09-22 09:51:19.000000000 +0000
+++ webhook-2.8.0/debian/control	2022-05-24 19:25:32.000000000 +0000
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Free Ekanayaka <freee@debian.org>,
-           Michael Stapelberg <stapelberg@debian.org>
-Build-Depends: debhelper (>= 10),
+           Michael Stapelberg <stapelberg@debian.org>,
+Build-Depends: debhelper-compat (= 13),
                dh-golang,
-               golang-go,
-               golang-github-urfave-negroni-dev,
+               golang-github-fsnotify-fsnotify-dev,
                golang-github-gorilla-mux-dev,
-               golang-github-fsnotify-fsnotify-dev
+               golang-github-urfave-negroni-dev,
+               golang-go,
 Standards-Version: 4.6.0.1
 Homepage: https://github.com/adnanh/webhook
 Vcs-Browser: https://salsa.debian.org/go-team/packages/webhook
@@ -19,9 +19,9 @@
 
 Package: webhook
 Architecture: any
-Built-Using: ${misc:Built-Using}
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Built-Using: ${misc:Built-Using},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Small server for creating HTTP endpoints (hooks)
  Webhook is a lightweight configurable tool written in Go, that
  allows you to easily create HTTP endpoints (hooks) on your
diff -Nru webhook-2.8.0/debian/gbp.conf webhook-2.8.0/debian/gbp.conf
--- webhook-2.8.0/debian/gbp.conf	2021-09-22 09:33:58.000000000 +0000
+++ webhook-2.8.0/debian/gbp.conf	2022-05-24 19:25:32.000000000 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
-pristine-tar = True
+debian-branch = debian/sid
+dist = DEP14
diff -Nru webhook-2.8.0/debian/gitlab-ci.yml webhook-2.8.0/debian/gitlab-ci.yml
--- webhook-2.8.0/debian/gitlab-ci.yml	2021-09-22 09:33:58.000000000 +0000
+++ webhook-2.8.0/debian/gitlab-ci.yml	2022-05-24 19:25:32.000000000 +0000
@@ -1,28 +1,6 @@
-
 # auto-generated, DO NOT MODIFY.
 # The authoritative copy of this file lives at:
-# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go
-
-# TODO: publish under debian-go-team/ci
-image: stapelberg/ci2
-
-test_the_archive:
-  artifacts:
-    paths:
-    - before-applying-commit.json
-    - after-applying-commit.json
-  script:
-    # Create an overlay to discard writes to /srv/gopath/src after the build:
-    - "rm -rf /cache/overlay/{upper,work}"
-    - "mkdir -p /cache/overlay/{upper,work}"
-    - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src"
-    - "export GOPATH=/srv/gopath"
-    - "export GOCACHE=/cache/go"
-    # Build the world as-is:
-    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json"
-    # Copy this package into the overlay:
-    - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'"
-    - "pgt-gopath -dsc /tmp/export/*.dsc"
-    # Rebuild the world:
-    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json"
-    - "ci-diff before-applying-commit.json after-applying-commit.json"
+# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
+---
+include:
+  - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml
diff -Nru webhook-2.8.0/debian/tests/control webhook-2.8.0/debian/tests/control
--- webhook-2.8.0/debian/tests/control	2021-09-22 09:33:58.000000000 +0000
+++ webhook-2.8.0/debian/tests/control	2022-05-24 19:25:32.000000000 +0000
@@ -1,5 +1,5 @@
 Tests: simple-webhook
 Restrictions: needs-root, isolation-container
-Depends: @,
-  systemd,
-  curl
+Depends: curl,
+         systemd,
+         @,