diff --git a/debian/changelog b/debian/changelog
index bc87c4f5676d7ce485d231205c3460714f649eed..5af2473d50d5a41f12e52f281936c2ad87a30181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-cinderclient (1:8.3.0-3) UNRELEASED; urgency=medium
+
+  * Bump debhelper from old 11 to 13.
+    + Replace python_distutils buildsystem with pybuild.
+  * Set upstream metadata fields: Repository, Repository-Browse.
+  * Update standards version to 4.6.0, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 31 Aug 2022 12:29:47 -0000
+
 python-cinderclient (1:8.3.0-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff --git a/debian/control b/debian/control
index 6d43f29de52da0990f261e79c196515b26e27311..9ae7bdd99381019bab121e7fd960a414836e94b7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Corey Bryant <corey.bryant@canonical.com>,
  Thomas Goirand <zigo@debian.org>,
 Build-Depends:
- debhelper-compat (= 11),
+ debhelper-compat (= 13),
  dh-python,
  openstack-pkg-tools,
  python3-all,
@@ -33,7 +33,7 @@ Build-Depends-Indep:
  python3-tempest (>= 1:26.0.0),
  python3-testtools,
  subunit,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-cinderclient
 Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-cinderclient.git
 Homepage: https://github.com/openstack/python-cinderclient
diff --git a/debian/rules b/debian/rules
index 8acee4988d0340839c37e941c19debbf3c3195c0..272aa7fa270ea634a14a505b5e9901a53ce30f41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@  --with python3
+	dh $@  --with python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	rm -rf build
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000000000000000000000000000000000000..530071a573888577fe5781948c72628a0a57567c
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Repository: https://github.com/openstack/python-cinderclient.git
+Repository-Browse: https://github.com/openstack/python-cinderclient