diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 349315cc62..c82dbd1232 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -525,36 +525,18 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
-- job:
-    name: openstack-ansible-upgrade-aio_metal-ubuntu-focal
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-focal
-    timeout: 10800
-
 - job:
     name: openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
     timeout: 10800
 
-- job:
-    name: openstack-ansible-upgrade-aio_lxc-ubuntu-focal
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-focal
-    timeout: 10800
-
 - job:
     name: openstack-ansible-upgrade_yoga-aio_lxc-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
     timeout: 10800
 
-- job:
-    name: openstack-ansible-upgrade-infra_lxc-ubuntu-focal
-    parent: openstack-ansible-deploy-aio-infra
-    nodeset: ubuntu-focal
-    timeout: 10800
-
 - job:
     name: openstack-ansible-upgrade_yoga-infra_lxc-ubuntu-focal
     parent: openstack-ansible-deploy-aio-infra
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index c3c1453953..b37f572eb1 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -57,31 +57,31 @@
     periodic:
       jobs:
         - openstack-ansible-deploy-aio_lxc-ubuntu-jammy
-        - openstack-ansible-upgrade-aio_lxc-ubuntu-focal
+        - openstack-ansible-upgrade-aio_lxc-ubuntu-jammy
 
 - project-template:
     name: openstack-ansible-upgrade-infra_lxc-jobs
     check:
       jobs:
         - openstack-ansible-upgrade-infra_lxc-rockylinux-9
-        - openstack-ansible-upgrade-infra_lxc-ubuntu-focal
+        - openstack-ansible-upgrade-infra_lxc-ubuntu-jammy
         - openstack-ansible-upgrade_yoga-infra_lxc-ubuntu-focal
     gate:
       jobs:
         - openstack-ansible-upgrade-infra_lxc-rockylinux-9
-        - openstack-ansible-upgrade-infra_lxc-ubuntu-focal
+        - openstack-ansible-upgrade-infra_lxc-ubuntu-jammy
 
 - project-template:
     name: openstack-ansible-upgrade-aio_metal-jobs
     check:
       jobs:
         - openstack-ansible-upgrade-aio_metal-rockylinux-9
-        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+        - openstack-ansible-upgrade-aio_metal-ubuntu-jammy
         - openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal
     gate:
       jobs:
         - openstack-ansible-upgrade-aio_metal-rockylinux-9
-        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+        - openstack-ansible-upgrade-aio_metal-ubuntu-jammy
 
 - project-template:
     name: openstack-ansible-deploy-infra_lxc-jobs
@@ -173,7 +173,7 @@
         - openstack-ansible-deploy-aio_metal_tls-rockylinux-9
         - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy
         - openstack-ansible-upgrade-aio_metal-rockylinux-9
-        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+        - openstack-ansible-upgrade-aio_metal-ubuntu-jammy
         - openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal
     gate:
       jobs: