diff --git a/.zuul.yaml b/.zuul.yaml
index da342da..c5114ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,6 +13,8 @@
         - dib-nodepool-functional-openstack-centos-8-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
+        - dib-nodepool-functional-openstack-ubuntu-focal-src
+        - dib-nodepool-functional-openstack-debian-bullseye-src
     gate:
       jobs:
         - opendev-buildset-registry
@@ -21,11 +23,11 @@
         - dib-nodepool-functional-openstack-centos-8-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
+        - dib-nodepool-functional-openstack-ubuntu-focal-src
+        - dib-nodepool-functional-openstack-debian-bullseye-src
     experimental:
       jobs:
         - opendev-buildset-registry
         - nodepool-build-image-siblings
-        - dib-nodepool-functional-openstack-debian-stretch-src
-        - dib-nodepool-functional-openstack-debian-buster-src
         - dib-nodepool-functional-openstack-opensuse-15-src
         - dib-nodepool-functional-openstack-opensuse-tumbleweed-src
diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 0000000..a001fa2
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,3 @@
+build-essential [platform:dpkg test]
+python3-all-dev [platform:dpkg test]
+libffi-dev [platform:dpkg test]