diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 12ced367da..112b1675c8 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -5,7 +5,6 @@
         - kolla-build-debian
         - kolla-build-debian-podman
         - kolla-ansible-debian
-        - kolla-ansible-debian-upgrade
     check-arm64:
       jobs:
         - kolla-build-debian-aarch64
@@ -15,7 +14,6 @@
         - kolla-build-debian
         - kolla-build-debian-podman
         - kolla-ansible-debian
-        - kolla-ansible-debian-upgrade
     periodic-stable:
       jobs:
         - kolla-publish-debian-quay
diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml
index 49c1c4c240..9d2c6efba7 100644
--- a/.zuul.d/rocky.yaml
+++ b/.zuul.d/rocky.yaml
@@ -5,12 +5,9 @@
         - kolla-build-rocky9
         - kolla-build-rocky9-podman
         - kolla-ansible-rocky9
-        - kolla-ansible-rocky9-upgrade
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-rocky9-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-rocky9-upgrade-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
         - kolla-ansible-rocky9-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
         - kolla-ansible-rocky9-swift:
@@ -43,7 +40,6 @@
         - kolla-build-rocky9
         - kolla-build-rocky9-podman
         - kolla-ansible-rocky9
-        - kolla-ansible-rocky9-upgrade
         - kolla-build-rocky10
         - kolla-build-rocky10-podman
         - kolla-ansible-rocky10
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index fab198e47f..ba7eb2c5d4 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -5,12 +5,9 @@
         - kolla-build-ubuntu
         - kolla-build-ubuntu-podman
         - kolla-ansible-ubuntu
-        - kolla-ansible-ubuntu-upgrade
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-ubuntu-upgrade-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
         - kolla-ansible-ubuntu-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
         - kolla-ansible-ubuntu-swift:
@@ -41,7 +38,6 @@
         - kolla-build-ubuntu
         - kolla-build-ubuntu-podman
         - kolla-ansible-ubuntu
-        - kolla-ansible-ubuntu-upgrade
     periodic-stable:
       jobs:
         - kolla-publish-ubuntu-quay
diff --git a/tox.ini b/tox.ini
index 3f842f8b29..b4425e37cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,6 +100,15 @@ commands =
   doc8 -e '.yaml' releasenotes/notes/
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
+[doc8]
+ignore-path = releasenotes/notes/bug-2111620-e40e1dec6fed309f.yaml,
+              releasenotes/notes/bug-2112140-41a1924c260e531c.yaml,
+              releasenotes/notes/debian-trixie-23987480043dc662.yaml,
+              releasenotes/notes/flamingo-prelude-b72f2599ed9d25d5.yaml,
+              releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml,
+              releasenotes/notes/image-purpose-1884e00f993e09d0.yaml,
+              releasenotes/notes/rocky-10-4111fa0160be14ab.yaml
+
 [flake8]
 show-source = True
 enable-extensions = H203,H106