diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 4a150c178..9358a4d10 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -24,9 +24,10 @@
         - containerfile/jammy-build-succeeds
         - openeuler-minimal/22.03-LTS-build-succeeds
         # Image based tests
-        - centos/8-stream-build-succeeds
         - centos/9-stream-build-succeeds
-        - fedora/build-succeeds
+        # NOTE(rpittau) Fedora 37 is EOL, disalbing this until we move to
+        # Fedora 39 or more recent.
+        #- fedora/build-succeeds
         # NOTE(ianw) 2022-08-02 : disabled due to upstream
         # checksum mismatches; see
         #  https://bugzilla.suse.com/show_bug.cgi?id=1202041
@@ -59,7 +60,6 @@
     vars:
       dib_functests:
         - almalinux-container/almalinux-9-aarch64-build-succeeds
-        - centos-minimal/8-stream-aarch64-build-succeeds
         - centos-minimal/9-stream-aarch64-build-succeeds
         - openeuler-minimal/22.03-LTS-build-succeeds
         - rocky-container/rocky-9-aarch64-build-succeeds
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 00f7158ca..475b5b294 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -39,9 +39,13 @@
         - dib-nodepool-functional-openstack-almalinux-9-containerfile-src:
             voting: false
         - dib-nodepool-functional-openstack-centos-7-src
-        - dib-nodepool-functional-openstack-centos-8-stream-src
+        # NOTE(rpittau) CS8 is EOL
+        # - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-37-containerfile-src
+        # NOTE(rpittau) Fedora 37 is EOL, moving to non-voting for the time being
+        # until we move to Fedora 39 or more recent.
+        - dib-nodepool-functional-openstack-fedora-37-containerfile-src:
+            voting: false
         - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src:
             voting: false
         - dib-nodepool-functional-openstack-rockylinux-9-containerfile-src:
@@ -98,9 +102,7 @@
         - opendev-buildset-registry
         - nodepool-build-image-siblings
         - dib-nodepool-functional-openstack-centos-7-src
-        - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-37-containerfile-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
diff --git a/roles/dib-ensure-debootstrap/tasks/main.yaml b/roles/dib-ensure-debootstrap/tasks/main.yaml
index b0d3b33c0..0f30d247c 100644
--- a/roles/dib-ensure-debootstrap/tasks/main.yaml
+++ b/roles/dib-ensure-debootstrap/tasks/main.yaml
@@ -4,9 +4,9 @@
   shell: |
     set -ex
     echo "APT::Default-Release: 'stable';" > /etc/apt/apt.conf.d/default-release
-    echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable-debian.list
+    # echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable-debian.list
     apt-get update
-    apt-get install -y debootstrap/unstable
+    apt-get install -y debootstrap
     # Remove the use of unstable as it seems to interfere with other tasks
-    rm /etc/apt/sources.list.d/unstable-debian.list
-    apt-get update
+    # rm /etc/apt/sources.list.d/unstable-debian.list
+    apt-get --assume-yes update