diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index 5c53f51aa..ad30a2eb7 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -33,7 +33,8 @@ PLATFORMS = [
     'centos-7',
     'centos-8',
     'centos-8-stream',
-    'debian-stretch',
+    'debian-buster',
+    'debian-bullseye',
     'fedora-32',
     # 'gentoo-17-0-systemd',
     'opensuse-15',
diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
index d9ad3750f..18587cc6e 100644
--- a/zuul-tests.d/general-roles-jobs.yaml
+++ b/zuul-tests.d/general-roles-jobs.yaml
@@ -155,14 +155,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-base-roles-debian-stretch
-    description: Tests roles in the 'base' job on debian-stretch
+    name: zuul-jobs-test-base-roles-debian-buster
+    description: Tests roles in the 'base' job on debian-buster
     parent: zuul-jobs-test-base-roles
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-base-roles-debian-bullseye
+    description: Tests roles in the 'base' job on debian-bullseye
+    parent: zuul-jobs-test-base-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-base-roles-fedora-32
@@ -270,14 +280,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-bindep-debian-stretch
-    description: Test the bindep role on debian-stretch
+    name: zuul-jobs-test-bindep-debian-buster
+    description: Test the bindep role on debian-buster
     parent: zuul-jobs-test-bindep
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-bindep-debian-bullseye
+    description: Test the bindep role on debian-bullseye
+    parent: zuul-jobs-test-bindep
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-bindep-fedora-32
@@ -455,16 +475,35 @@
             - secondary
 
 - job:
-    name: zuul-jobs-test-multinode-roles-debian-stretch
-    description: Tests multinode setup roles on debian-stretch
+    name: zuul-jobs-test-multinode-roles-debian-buster
+    description: Tests multinode setup roles on debian-buster
     parent: zuul-jobs-test-multinode-roles
     tags: auto-generated
     nodeset:
       nodes:
         - name: primary
-          label: debian-stretch
+          label: debian-buster
         - name: secondary
-          label: debian-stretch
+          label: debian-buster
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
+- job:
+    name: zuul-jobs-test-multinode-roles-debian-bullseye
+    description: Tests multinode setup roles on debian-bullseye
+    parent: zuul-jobs-test-multinode-roles
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: primary
+          label: debian-bullseye
+        - name: secondary
+          label: debian-bullseye
       groups:
         - name: switch
           nodes:
@@ -663,7 +702,8 @@
         - zuul-jobs-test-base-roles-centos-7
         - zuul-jobs-test-base-roles-centos-8
         - zuul-jobs-test-base-roles-centos-8-stream
-        - zuul-jobs-test-base-roles-debian-stretch
+        - zuul-jobs-test-base-roles-debian-buster
+        - zuul-jobs-test-base-roles-debian-bullseye
         - zuul-jobs-test-base-roles-fedora-32
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv
@@ -673,7 +713,8 @@
         - zuul-jobs-test-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-centos-8-stream
-        - zuul-jobs-test-bindep-debian-stretch
+        - zuul-jobs-test-bindep-debian-buster
+        - zuul-jobs-test-bindep-debian-bullseye
         - zuul-jobs-test-bindep-fedora-32
         - zuul-jobs-test-bindep-opensuse-15
         - zuul-jobs-test-bindep-opensuse-tumbleweed-nv
@@ -687,7 +728,8 @@
         - zuul-jobs-test-multinode-roles-centos-7
         - zuul-jobs-test-multinode-roles-centos-8
         - zuul-jobs-test-multinode-roles-centos-8-stream
-        - zuul-jobs-test-multinode-roles-debian-stretch
+        - zuul-jobs-test-multinode-roles-debian-buster
+        - zuul-jobs-test-multinode-roles-debian-bullseye
         - zuul-jobs-test-multinode-roles-fedora-32
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
@@ -708,7 +750,8 @@
         - zuul-jobs-test-base-roles-centos-7
         - zuul-jobs-test-base-roles-centos-8
         - zuul-jobs-test-base-roles-centos-8-stream
-        - zuul-jobs-test-base-roles-debian-stretch
+        - zuul-jobs-test-base-roles-debian-buster
+        - zuul-jobs-test-base-roles-debian-bullseye
         - zuul-jobs-test-base-roles-fedora-32
         - zuul-jobs-test-base-roles-opensuse-15
         - zuul-jobs-test-base-roles-ubuntu-bionic
@@ -717,7 +760,8 @@
         - zuul-jobs-test-bindep-centos-7
         - zuul-jobs-test-bindep-centos-8
         - zuul-jobs-test-bindep-centos-8-stream
-        - zuul-jobs-test-bindep-debian-stretch
+        - zuul-jobs-test-bindep-debian-buster
+        - zuul-jobs-test-bindep-debian-bullseye
         - zuul-jobs-test-bindep-fedora-32
         - zuul-jobs-test-bindep-opensuse-15
         - zuul-jobs-test-bindep-ubuntu-bionic
@@ -730,7 +774,8 @@
         - zuul-jobs-test-multinode-roles-centos-7
         - zuul-jobs-test-multinode-roles-centos-8
         - zuul-jobs-test-multinode-roles-centos-8-stream
-        - zuul-jobs-test-multinode-roles-debian-stretch
+        - zuul-jobs-test-multinode-roles-debian-buster
+        - zuul-jobs-test-multinode-roles-debian-bullseye
         - zuul-jobs-test-multinode-roles-fedora-32
         - zuul-jobs-test-multinode-roles-opensuse-15
         - zuul-jobs-test-multinode-roles-ubuntu-bionic
diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml
index 8f1da6757..c0a13aa5e 100644
--- a/zuul-tests.d/go-jobs.yaml
+++ b/zuul-tests.d/go-jobs.yaml
@@ -46,14 +46,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-golang-go-debian-stretch
-    description: Test the golang-go job on debian-stretch
+    name: zuul-jobs-test-golang-go-debian-buster
+    description: Test the golang-go job on debian-buster
     parent: zuul-jobs-test-golang-go
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-golang-go-debian-bullseye
+    description: Test the golang-go job on debian-bullseye
+    parent: zuul-jobs-test-golang-go
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-golang-go-fedora-32
@@ -122,7 +132,8 @@
         - zuul-jobs-test-golang-go-centos-7
         - zuul-jobs-test-golang-go-centos-8
         - zuul-jobs-test-golang-go-centos-8-stream
-        - zuul-jobs-test-golang-go-debian-stretch
+        - zuul-jobs-test-golang-go-debian-buster
+        - zuul-jobs-test-golang-go-debian-bullseye
         - zuul-jobs-test-golang-go-fedora-32
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv
@@ -134,7 +145,8 @@
         - zuul-jobs-test-golang-go-centos-7
         - zuul-jobs-test-golang-go-centos-8
         - zuul-jobs-test-golang-go-centos-8-stream
-        - zuul-jobs-test-golang-go-debian-stretch
+        - zuul-jobs-test-golang-go-debian-buster
+        - zuul-jobs-test-golang-go-debian-bullseye
         - zuul-jobs-test-golang-go-fedora-32
         - zuul-jobs-test-golang-go-opensuse-15
         - zuul-jobs-test-golang-go-ubuntu-bionic
diff --git a/zuul-tests.d/nim-jobs.yaml b/zuul-tests.d/nim-jobs.yaml
index e8c34c346..6eb7698cf 100644
--- a/zuul-tests.d/nim-jobs.yaml
+++ b/zuul-tests.d/nim-jobs.yaml
@@ -44,14 +44,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-nimble-debian-stretch
-    description: Test the nimble job on debian-stretch
+    name: zuul-jobs-test-nimble-debian-buster
+    description: Test the nimble job on debian-buster
     parent: zuul-jobs-test-nimble
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-nimble-debian-bullseye
+    description: Test the nimble job on debian-bullseye
+    parent: zuul-jobs-test-nimble
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-nimble-fedora-32
@@ -120,7 +130,8 @@
         - zuul-jobs-test-nimble-centos-7
         - zuul-jobs-test-nimble-centos-8
         - zuul-jobs-test-nimble-centos-8-stream
-        - zuul-jobs-test-nimble-debian-stretch
+        - zuul-jobs-test-nimble-debian-buster
+        - zuul-jobs-test-nimble-debian-bullseye
         - zuul-jobs-test-nimble-fedora-32
         - zuul-jobs-test-nimble-opensuse-15
         - zuul-jobs-test-nimble-opensuse-tumbleweed-nv
@@ -132,7 +143,8 @@
         - zuul-jobs-test-nimble-centos-7
         - zuul-jobs-test-nimble-centos-8
         - zuul-jobs-test-nimble-centos-8-stream
-        - zuul-jobs-test-nimble-debian-stretch
+        - zuul-jobs-test-nimble-debian-buster
+        - zuul-jobs-test-nimble-debian-bullseye
         - zuul-jobs-test-nimble-fedora-32
         - zuul-jobs-test-nimble-opensuse-15
         - zuul-jobs-test-nimble-ubuntu-bionic
diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml
index f2981ea75..132c0e862 100644
--- a/zuul-tests.d/packer-jobs.yaml
+++ b/zuul-tests.d/packer-jobs.yaml
@@ -48,14 +48,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-packer-debian-stretch
-    description: Test packer job on debian-stretch
+    name: zuul-jobs-test-packer-debian-buster
+    description: Test packer job on debian-buster
     parent: zuul-jobs-test-packer
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-packer-debian-bullseye
+    description: Test packer job on debian-bullseye
+    parent: zuul-jobs-test-packer
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-packer-fedora-32
@@ -124,7 +134,8 @@
         - zuul-jobs-test-packer-centos-7
         - zuul-jobs-test-packer-centos-8
         - zuul-jobs-test-packer-centos-8-stream
-        - zuul-jobs-test-packer-debian-stretch
+        - zuul-jobs-test-packer-debian-buster
+        - zuul-jobs-test-packer-debian-bullseye
         - zuul-jobs-test-packer-fedora-32
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-opensuse-tumbleweed-nv
@@ -136,7 +147,8 @@
         - zuul-jobs-test-packer-centos-7
         - zuul-jobs-test-packer-centos-8
         - zuul-jobs-test-packer-centos-8-stream
-        - zuul-jobs-test-packer-debian-stretch
+        - zuul-jobs-test-packer-debian-buster
+        - zuul-jobs-test-packer-debian-bullseye
         - zuul-jobs-test-packer-fedora-32
         - zuul-jobs-test-packer-opensuse-15
         - zuul-jobs-test-packer-ubuntu-bionic
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index 01dcbca5b..b11ae8444 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -41,14 +41,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-ensure-pip-debian-stretch
-    description: Test the ensure-pip role on debian-stretch
+    name: zuul-jobs-test-ensure-pip-debian-buster
+    description: Test the ensure-pip role on debian-buster
     parent: zuul-jobs-test-ensure-pip
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-ensure-pip-debian-bullseye
+    description: Test the ensure-pip role on debian-bullseye
+    parent: zuul-jobs-test-ensure-pip
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-ensure-pip-fedora-32
@@ -160,14 +170,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-ensure-tox-debian-stretch
-    description: Test the ensure-tox role on debian-stretch
+    name: zuul-jobs-test-ensure-tox-debian-buster
+    description: Test the ensure-tox role on debian-buster
     parent: zuul-jobs-test-ensure-tox
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-ensure-tox-debian-bullseye
+    description: Test the ensure-tox role on debian-bullseye
+    parent: zuul-jobs-test-ensure-tox
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-ensure-tox-fedora-32
@@ -273,14 +293,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
-    description: Test the fetch-sphinx-tarball role on debian-stretch
+    name: zuul-jobs-test-fetch-sphinx-tarball-debian-buster
+    description: Test the fetch-sphinx-tarball role on debian-buster
     parent: zuul-jobs-test-fetch-sphinx-tarball
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
+    description: Test the fetch-sphinx-tarball role on debian-bullseye
+    parent: zuul-jobs-test-fetch-sphinx-tarball
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-fetch-sphinx-tarball-fedora-32
@@ -451,7 +481,8 @@
         - zuul-jobs-test-ensure-pip-centos-7
         - zuul-jobs-test-ensure-pip-centos-8
         - zuul-jobs-test-ensure-pip-centos-8-stream
-        - zuul-jobs-test-ensure-pip-debian-stretch
+        - zuul-jobs-test-ensure-pip-debian-buster
+        - zuul-jobs-test-ensure-pip-debian-bullseye
         - zuul-jobs-test-ensure-pip-fedora-32
         - zuul-jobs-test-ensure-pip-opensuse-15
         - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv
@@ -462,7 +493,8 @@
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
         - zuul-jobs-test-ensure-tox-centos-8-stream
-        - zuul-jobs-test-ensure-tox-debian-stretch
+        - zuul-jobs-test-ensure-tox-debian-buster
+        - zuul-jobs-test-ensure-tox-debian-bullseye
         - zuul-jobs-test-ensure-tox-fedora-32
         - zuul-jobs-test-ensure-tox-opensuse-15
         - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv
@@ -472,7 +504,8 @@
         - zuul-jobs-test-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream
-        - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
+        - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
+        - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
         - zuul-jobs-test-fetch-sphinx-tarball-fedora-32
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv
@@ -493,7 +526,8 @@
         - zuul-jobs-test-ensure-pip-centos-7
         - zuul-jobs-test-ensure-pip-centos-8
         - zuul-jobs-test-ensure-pip-centos-8-stream
-        - zuul-jobs-test-ensure-pip-debian-stretch
+        - zuul-jobs-test-ensure-pip-debian-buster
+        - zuul-jobs-test-ensure-pip-debian-bullseye
         - zuul-jobs-test-ensure-pip-fedora-32
         - zuul-jobs-test-ensure-pip-opensuse-15
         - zuul-jobs-test-ensure-pip-ubuntu-bionic
@@ -503,7 +537,8 @@
         - zuul-jobs-test-ensure-tox-centos-7
         - zuul-jobs-test-ensure-tox-centos-8
         - zuul-jobs-test-ensure-tox-centos-8-stream
-        - zuul-jobs-test-ensure-tox-debian-stretch
+        - zuul-jobs-test-ensure-tox-debian-buster
+        - zuul-jobs-test-ensure-tox-debian-bullseye
         - zuul-jobs-test-ensure-tox-fedora-32
         - zuul-jobs-test-ensure-tox-opensuse-15
         - zuul-jobs-test-ensure-tox-ubuntu-bionic
@@ -512,7 +547,8 @@
         - zuul-jobs-test-fetch-sphinx-tarball-centos-7
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8
         - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream
-        - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch
+        - zuul-jobs-test-fetch-sphinx-tarball-debian-buster
+        - zuul-jobs-test-fetch-sphinx-tarball-debian-bullseye
         - zuul-jobs-test-fetch-sphinx-tarball-fedora-32
         - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15
         - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic
diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml
index bfcbe3e71..a019b5b99 100644
--- a/zuul-tests.d/python-roles-jobs.yaml
+++ b/zuul-tests.d/python-roles-jobs.yaml
@@ -43,14 +43,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-build-python-release-jobs-debian-stretch
-    description: Test the build-python-release-jobs role on debian-stretch
+    name: zuul-jobs-test-build-python-release-jobs-debian-buster
+    description: Test the build-python-release-jobs role on debian-buster
     parent: zuul-jobs-test-build-python-release-jobs
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-build-python-release-jobs-debian-bullseye
+    description: Test the build-python-release-jobs role on debian-bullseye
+    parent: zuul-jobs-test-build-python-release-jobs
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-build-python-release-jobs-fedora-32
@@ -153,14 +163,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-ensure-python-pyenv-debian-stretch
-    description: Test the ensure-python role with pyenv on debian-stretch
+    name: zuul-jobs-test-ensure-python-pyenv-debian-buster
+    description: Test the ensure-python role with pyenv on debian-buster
     parent: zuul-jobs-test-ensure-python-pyenv
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-ensure-python-pyenv-debian-bullseye
+    description: Test the ensure-python role with pyenv on debian-bullseye
+    parent: zuul-jobs-test-ensure-python-pyenv
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-ensure-python-pyenv-fedora-32
@@ -229,7 +249,8 @@
         - zuul-jobs-test-build-python-release-jobs-centos-7
         - zuul-jobs-test-build-python-release-jobs-centos-8
         - zuul-jobs-test-build-python-release-jobs-centos-8-stream
-        - zuul-jobs-test-build-python-release-jobs-debian-stretch
+        - zuul-jobs-test-build-python-release-jobs-debian-buster
+        - zuul-jobs-test-build-python-release-jobs-debian-bullseye
         - zuul-jobs-test-build-python-release-jobs-fedora-32
         - zuul-jobs-test-build-python-release-jobs-opensuse-15
         - zuul-jobs-test-build-python-release-jobs-opensuse-tumbleweed-nv
@@ -239,7 +260,8 @@
         - zuul-jobs-test-ensure-python-pyenv-centos-7
         - zuul-jobs-test-ensure-python-pyenv-centos-8
         - zuul-jobs-test-ensure-python-pyenv-centos-8-stream
-        - zuul-jobs-test-ensure-python-pyenv-debian-stretch
+        - zuul-jobs-test-ensure-python-pyenv-debian-buster
+        - zuul-jobs-test-ensure-python-pyenv-debian-bullseye
         - zuul-jobs-test-ensure-python-pyenv-fedora-32
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv
@@ -251,7 +273,8 @@
         - zuul-jobs-test-build-python-release-jobs-centos-7
         - zuul-jobs-test-build-python-release-jobs-centos-8
         - zuul-jobs-test-build-python-release-jobs-centos-8-stream
-        - zuul-jobs-test-build-python-release-jobs-debian-stretch
+        - zuul-jobs-test-build-python-release-jobs-debian-buster
+        - zuul-jobs-test-build-python-release-jobs-debian-bullseye
         - zuul-jobs-test-build-python-release-jobs-fedora-32
         - zuul-jobs-test-build-python-release-jobs-opensuse-15
         - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic
@@ -260,7 +283,8 @@
         - zuul-jobs-test-ensure-python-pyenv-centos-7
         - zuul-jobs-test-ensure-python-pyenv-centos-8
         - zuul-jobs-test-ensure-python-pyenv-centos-8-stream
-        - zuul-jobs-test-ensure-python-pyenv-debian-stretch
+        - zuul-jobs-test-ensure-python-pyenv-debian-buster
+        - zuul-jobs-test-ensure-python-pyenv-debian-bullseye
         - zuul-jobs-test-ensure-python-pyenv-fedora-32
         - zuul-jobs-test-ensure-python-pyenv-opensuse-15
         - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic
diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml
index e27edca23..1ff968e71 100644
--- a/zuul-tests.d/rust-jobs.yaml
+++ b/zuul-tests.d/rust-jobs.yaml
@@ -44,14 +44,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-rust-debian-stretch
-    description: Test the rust roles on debian-stretch
+    name: zuul-jobs-test-rust-debian-buster
+    description: Test the rust roles on debian-buster
     parent: zuul-jobs-test-rust
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-rust-debian-bullseye
+    description: Test the rust roles on debian-bullseye
+    parent: zuul-jobs-test-rust
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-rust-fedora-32
@@ -120,7 +130,8 @@
         - zuul-jobs-test-rust-centos-7
         - zuul-jobs-test-rust-centos-8
         - zuul-jobs-test-rust-centos-8-stream
-        - zuul-jobs-test-rust-debian-stretch
+        - zuul-jobs-test-rust-debian-buster
+        - zuul-jobs-test-rust-debian-bullseye
         - zuul-jobs-test-rust-fedora-32
         - zuul-jobs-test-rust-opensuse-15
         - zuul-jobs-test-rust-opensuse-tumbleweed-nv
@@ -132,7 +143,8 @@
         - zuul-jobs-test-rust-centos-7
         - zuul-jobs-test-rust-centos-8
         - zuul-jobs-test-rust-centos-8-stream
-        - zuul-jobs-test-rust-debian-stretch
+        - zuul-jobs-test-rust-debian-buster
+        - zuul-jobs-test-rust-debian-bullseye
         - zuul-jobs-test-rust-fedora-32
         - zuul-jobs-test-rust-opensuse-15
         - zuul-jobs-test-rust-ubuntu-bionic
diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml
index 447e3a0b9..a13f1cfcf 100644
--- a/zuul-tests.d/terraform-jobs-roles.yaml
+++ b/zuul-tests.d/terraform-jobs-roles.yaml
@@ -50,14 +50,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-terraform-debian-stretch
-    description: Test terraform job on debian-stretch
+    name: zuul-jobs-test-terraform-debian-buster
+    description: Test terraform job on debian-buster
     parent: zuul-jobs-test-terraform
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-terraform-debian-bullseye
+    description: Test terraform job on debian-bullseye
+    parent: zuul-jobs-test-terraform
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-terraform-fedora-32
@@ -173,14 +183,24 @@
           label: centos-8-stream
 
 - job:
-    name: zuul-jobs-test-terraform-role-debian-stretch
-    description: Test terraform roles on debian-stretch
+    name: zuul-jobs-test-terraform-role-debian-buster
+    description: Test terraform roles on debian-buster
     parent: zuul-jobs-test-terraform-role
     tags: auto-generated
     nodeset:
       nodes:
-        - name: debian-stretch
-          label: debian-stretch
+        - name: debian-buster
+          label: debian-buster
+
+- job:
+    name: zuul-jobs-test-terraform-role-debian-bullseye
+    description: Test terraform roles on debian-bullseye
+    parent: zuul-jobs-test-terraform-role
+    tags: auto-generated
+    nodeset:
+      nodes:
+        - name: debian-bullseye
+          label: debian-bullseye
 
 - job:
     name: zuul-jobs-test-terraform-role-fedora-32
@@ -249,7 +269,8 @@
         - zuul-jobs-test-terraform-centos-7
         - zuul-jobs-test-terraform-centos-8
         - zuul-jobs-test-terraform-centos-8-stream
-        - zuul-jobs-test-terraform-debian-stretch
+        - zuul-jobs-test-terraform-debian-buster
+        - zuul-jobs-test-terraform-debian-bullseye
         - zuul-jobs-test-terraform-fedora-32
         - zuul-jobs-test-terraform-opensuse-15
         - zuul-jobs-test-terraform-ubuntu-bionic
@@ -258,7 +279,8 @@
         - zuul-jobs-test-terraform-role-centos-7
         - zuul-jobs-test-terraform-role-centos-8
         - zuul-jobs-test-terraform-role-centos-8-stream
-        - zuul-jobs-test-terraform-role-debian-stretch
+        - zuul-jobs-test-terraform-role-debian-buster
+        - zuul-jobs-test-terraform-role-debian-bullseye
         - zuul-jobs-test-terraform-role-fedora-32
         - zuul-jobs-test-terraform-role-opensuse-15
         - zuul-jobs-test-terraform-role-ubuntu-bionic