diff --git a/rebuild b/rebuild
index 26d4e2b..6b10ecd 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-4fc7b7e6-0e2c-11eb-a9d8-870e71103627
+82a5f120-5745-11eb-b674-bba99621a1b4
diff --git a/src/templates/rocky/barbican.conf b/src/templates/rocky/barbican.conf
index 287f8a6..75f6bb3 100644
--- a/src/templates/rocky/barbican.conf
+++ b/src/templates/rocky/barbican.conf
@@ -4,6 +4,10 @@ bind_host = {{ options.service_listen_info.barbican_worker.ip }}
 bind_port = {{ options.service_listen_info.barbican_worker.port }}
 host_href = {{ options.external_endpoints.barbican_worker.url }}
 
+# Create the Barbican database on service startup. This is `true` by default
+# up to Ussuri and `false` by default from Victoria on:
+db_auto_create = true
+
 {% include "parts/section-transport-url" %}
 
 {% include "parts/database" %}
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index a4d92cc..2a8741d 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1 +1,5 @@
 psutil
+
+git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
+
+git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 8ab24b2..3f08524 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -22,6 +22,8 @@ importlib-resources<3.0.0; python_version < '3.6'
 # dropped support for python 3.5:
 osprofiler<2.7.0;python_version<'3.6'
 stevedore<1.31.0;python_version<'3.6'
+debtcollector<1.22.0;python_version<'3.6'
+oslo.utils<=3.41.0;python_version<'3.6'
 
 requests>=2.18.4
 charms.reactive