diff --git a/playbooks/vars_2024.1.yaml b/playbooks/vars_2024.1.yaml
deleted file mode 100644
index 75f0835f..00000000
--- a/playbooks/vars_2024.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-image_tag: "2024.1-ubuntu_jammy"
-distro_image: "public.ecr.aws/ubuntu/ubuntu:jammy"
-openstack_release: "stable/2024.1"
-ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
-openstack_images:
-  - "{{ barbican_image }}"
-  - "{{ ceilometer_image }}"
-  - "{{ cinder_image }}"
-  - "{{ cloudkitty_image }}"
-  - "{{ cyborg_image }}"
-  - "{{ designate_image }}"
-  - "{{ glance_image }}"
-  - "{{ heat_image }}"
-  - "{{ horizon_image }}"
-  - "{{ ironic_image }}"
-  - "{{ keystone_image }}"
-  - "{{ magnum_image }}"
-  - "{{ manila_image }}"
-  - "{{ mistral_image }}"
-  - "{{ neutron_image }}"
-  - "{{ nova_image }}"
-  - "{{ octavia_image }}"
-  - "{{ openstack_client_image }}"
-  - "{{ placement_image }}"
-  - "{{ tacker_image}}"
-  - "{{ watcher_image }}"
diff --git a/playbooks/vars_2025.2_jammy.yaml b/playbooks/vars_2025.2_jammy.yaml
deleted file mode 100644
index 6cdf4317..00000000
--- a/playbooks/vars_2025.2_jammy.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-image_tag: "2025.2-ubuntu_jammy"
-distro_image: "public.ecr.aws/ubuntu/ubuntu:jammy"
-openstack_release: "stable/2025.2"
-ceph_repo: "deb https://download.ceph.com/debian-squid/ jammy main"
-openstack_images:
-  - "{{ barbican_image }}"
-  - "{{ cinder_image }}"
-  - "{{ cloudkitty_image }}"
-  - "{{ cyborg_image }}"
-  - "{{ designate_image }}"
-  - "{{ glance_image }}"
-  - "{{ heat_image }}"
-  - "{{ horizon_image }}"
-  - "{{ ironic_image }}"
-  - "{{ keystone_image }}"
-  - "{{ magnum_image }}"
-  - "{{ manila_image }}"
-  - "{{ neutron_image }}"
-  - "{{ nova_image }}"
-  - "{{ octavia_image }}"
-  - "{{ openstack_client_image }}"
-  - "{{ placement_image }}"
-  - "{{ tacker_image}}"
-  - "{{ watcher_image }}"
-  - "{{ freezer_image }}"
-  - "{{ freezer_api_image }}"
-  - "{{ blazar_image }}"
-  - "{{ zaqar_image }}"
diff --git a/playbooks/vars_2025.2_noble.yaml b/playbooks/vars_2025.2_noble.yaml
index 6c1e5f40..caf257d9 100644
--- a/playbooks/vars_2025.2_noble.yaml
+++ b/playbooks/vars_2025.2_noble.yaml
@@ -1,7 +1,7 @@
 image_tag: "2025.2-ubuntu_noble"
 distro_image: "public.ecr.aws/ubuntu/ubuntu:noble"
 openstack_release: "stable/2025.2"
-# NOTE: Ubuntu Noble provides Ceph Squid packages out of the box
+# NOTE: Ubuntu Noble provides Ceph packages out of the box
 ceph_repo: ""
 openstack_images:
   - "{{ barbican_image }}"
diff --git a/playbooks/vars_master_jammy.yaml b/playbooks/vars_master_jammy.yaml
deleted file mode 100644
index da5c1ca9..00000000
--- a/playbooks/vars_master_jammy.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-image_tag: "master-ubuntu_jammy"
-distro_image: "public.ecr.aws/ubuntu/ubuntu:jammy"
-openstack_release: "master"
-ceph_repo: "deb https://download.ceph.com/debian-squid/ jammy main"
-openstack_images:
-  - "{{ barbican_image }}"
-  - "{{ ceilometer_image }}"
-  - "{{ cinder_image }}"
-  - "{{ cloudkitty_image }}"
-  - "{{ cyborg_image }}"
-  - "{{ designate_image }}"
-  - "{{ glance_image }}"
-  - "{{ heat_image }}"
-  - "{{ horizon_image }}"
-  - "{{ ironic_image }}"
-  - "{{ keystone_image }}"
-  - "{{ manila_image }}"
-  - "{{ neutron_image }}"
-  - "{{ nova_image }}"
-  - "{{ octavia_image }}"
-  - "{{ openstack_client_image }}"
-  - "{{ placement_image }}"
-  - "{{ tacker_image}}"
-  - "{{ watcher_image }}"
diff --git a/zuul.d/2024.1-ubuntu_jammy.yaml b/zuul.d/2024.1-ubuntu_jammy.yaml
deleted file mode 100644
index 1b3f1755..00000000
--- a/zuul.d/2024.1-ubuntu_jammy.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- job:
-    name: loci-build-2024-1-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    vars: &vars
-      vars_files:
-        - vars_2024.1.yaml
-
-- job:
-    name: loci-upload-2024-1-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    post-run:
-      - playbooks/upload.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-
-- job:
-    name: loci-promote-2024-1-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    run:
-      - playbooks/promote.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-    nodeset:
-      nodes: []
-
-- job:
-    name: loci-compute-kit-2024-1-ubuntu_jammy
-    parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy
-    files:
-      - ^.*$
-    required-projects:
-      - openstack/openstack-helm
-    dependencies:
-      - name: loci-build-2024-1-ubuntu_jammy
-        soft: true
-      - name: loci-upload-2024-1-ubuntu_jammy
-        soft: true
-
-- job:
-    name: loci-cinder-2024-1-ubuntu_jammy
-    parent: openstack-helm-cinder-2024-1-ubuntu_jammy
-    files:
-      - ^.*$
-    required-projects:
-      - openstack/openstack-helm
-    dependencies:
-      - name: loci-build-2024-1-ubuntu_jammy
-        soft: true
-      - name: loci-upload-2024-1-ubuntu_jammy
-        soft: true
diff --git a/zuul.d/2025.2-ubuntu_jammy.yaml b/zuul.d/2025.2-ubuntu_jammy.yaml
deleted file mode 100644
index 9bc27cf3..00000000
--- a/zuul.d/2025.2-ubuntu_jammy.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-- job:
-    name: loci-build-2025-2-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    vars: &vars
-      vars_files:
-        - vars_2025.2_jammy.yaml
-
-- job:
-    name: loci-upload-2025-2-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    post-run:
-      - playbooks/upload.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-
-- job:
-    name: loci-promote-2025-2-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    run:
-      - playbooks/promote.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-    nodeset:
-      nodes: []
-
-# NOTE: uncomment when 2025.2 works
-# - job:
-#     name: loci-compute-kit-2025-2-ubuntu_jammy
-#     parent: openstack-helm-compute-kit-2025-2-ubuntu_jammy
-#     files:
-#       - ^.*$
-#     required-projects:
-#       - openstack/openstack-helm
-#     dependencies:
-#       - name: loci-build-2025-2-ubuntu_jammy
-#         soft: true
-#       - name: loci-upload-2025-2-ubuntu_jammy
-#         soft: true
-
-# - job:
-#     name: loci-cinder-2025-2-ubuntu_jammy
-#     parent: openstack-helm-cinder-2025-2-ubuntu_jammy
-#     files:
-#       - ^.*$
-#     required-projects:
-#       - openstack/openstack-helm
-#     dependencies:
-#       - name: loci-build-2025-2-ubuntu_jammy
-#         soft: true
-#       - name: loci-upload-2025-2-ubuntu_jammy
-#         soft: true
diff --git a/zuul.d/2025.2-ubuntu_noble.yaml b/zuul.d/2025.2-ubuntu_noble.yaml
index 176227ac..46077660 100644
--- a/zuul.d/2025.2-ubuntu_noble.yaml
+++ b/zuul.d/2025.2-ubuntu_noble.yaml
@@ -49,29 +49,28 @@
     nodeset:
       nodes: []
 
-# NOTE: uncomment when 2025.2 works
-# - job:
-#     name: loci-compute-kit-2025-2-ubuntu_noble
-#     parent: openstack-helm-compute-kit-2025-2-ubuntu_noble
-#     files:
-#       - ^.*$
-#     required-projects:
-#       - openstack/openstack-helm
-#     dependencies:
-#       - name: loci-build-2025-2-ubuntu_noble
-#         soft: true
-#       - name: loci-upload-2025-2-ubuntu_noble
-#         soft: true
+- job:
+    name: loci-compute-kit-2025-2-ubuntu_noble
+    parent: openstack-helm-compute-kit-2025-2-ubuntu_noble
+    files:
+      - ^.*$
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-2-ubuntu_noble
+        soft: true
+      - name: loci-upload-2025-2-ubuntu_noble
+        soft: true
 
-# - job:
-#     name: loci-cinder-2025-2-ubuntu_noble
-#     parent: openstack-helm-cinder-2025-2-ubuntu_noble
-#     files:
-#       - ^.*$
-#     required-projects:
-#       - openstack/openstack-helm
-#     dependencies:
-#       - name: loci-build-2025-2-ubuntu_noble
-#         soft: true
-#       - name: loci-upload-2025-2-ubuntu_noble
-#         soft: true
+- job:
+    name: loci-cinder-2025-2-ubuntu_noble
+    parent: openstack-helm-cinder-2025-2-ubuntu_noble
+    files:
+      - ^.*$
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-2-ubuntu_noble
+        soft: true
+      - name: loci-upload-2025-2-ubuntu_noble
+        soft: true
diff --git a/zuul.d/master-ubuntu_jammy.yaml b/zuul.d/master-ubuntu_jammy.yaml
deleted file mode 100644
index fdc07a8c..00000000
--- a/zuul.d/master-ubuntu_jammy.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: loci-build-master-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    voting: false
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    vars: &vars
-      vars_files:
-        - vars_master_jammy.yaml
-
-- job:
-    name: loci-upload-master-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    timeout: 10800
-    voting: false
-    dependencies:
-      - name: loci-buildset-registry
-    pre-run:
-      - playbooks/inject-keys.yaml
-      - playbooks/pre-build.yaml
-    run:
-      - playbooks/build.yaml
-    post-run:
-      - playbooks/upload.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-
-- job:
-    name: loci-promote-master-ubuntu_jammy
-    roles:
-      - zuul: openstack/loci
-      - zuul: zuul/zuul-jobs
-    voting: false
-    run:
-      - playbooks/promote.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-    nodeset:
-      nodes: []
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6e488422..580448ba 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,10 +2,6 @@
     check:
       jobs:
         - loci-buildset-registry
-        # 2024.1 Ubuntu Jammy
-        - loci-build-2024-1-ubuntu_jammy
-        - loci-compute-kit-2024-1-ubuntu_jammy
-        - loci-cinder-2024-1-ubuntu_jammy
         # 2024.2 Ubuntu Jammy
         - loci-build-2024-2-ubuntu_jammy
         - loci-compute-kit-2024-2-ubuntu_jammy
@@ -18,52 +14,31 @@
         - loci-build-2025-1-ubuntu_noble
         - loci-compute-kit-2025-1-ubuntu_noble
         - loci-cinder-2025-1-ubuntu_noble
-        # 2025.2 Ubuntu Jammy
-        - loci-build-2025-2-ubuntu_jammy
-        # - loci-compute-kit-2025-2-ubuntu_jammy
-        # - loci-cinder-2025-2-ubuntu_jammy
         # 2025.2 Ubuntu Noble
         - loci-build-2025-2-ubuntu_noble
-        # - loci-compute-kit-2025-2-ubuntu_noble
-        # - loci-cinder-2025-2-ubuntu_noble
-
+        - loci-compute-kit-2025-2-ubuntu_noble
+        - loci-cinder-2025-2-ubuntu_noble
         # Disabled for now because master builds are unstable
-        # # Master Ubuntu Jammy
-        # - loci-build-master-ubuntu_jammy
         # # Master Ubuntu Noble
         # - loci-build-master-ubuntu_noble
     gate:
       jobs:
         - loci-buildset-registry
-        - loci-upload-2024-1-ubuntu_jammy
         - loci-upload-2024-2-ubuntu_jammy
         - loci-upload-2025-1-ubuntu_jammy
         - loci-upload-2025-1-ubuntu_noble
-        - loci-upload-2025-2-ubuntu_jammy
         - loci-upload-2025-2-ubuntu_noble
-        - loci-upload-master-ubuntu_jammy
-        - loci-upload-master-ubuntu_noble
+        # - loci-upload-master-ubuntu_noble
     promote:
       jobs:
-        - loci-promote-2024-1-ubuntu_jammy
         - loci-promote-2024-2-ubuntu_jammy
         - loci-promote-2025-1-ubuntu_jammy
         - loci-promote-2025-1-ubuntu_noble
-        - loci-promote-2025-2-ubuntu_jammy
         - loci-promote-2025-2-ubuntu_noble
-        - loci-promote-master-ubuntu_jammy
-        - loci-promote-master-ubuntu_noble
+        # - loci-promote-master-ubuntu_noble
     periodic:
       jobs:
         - loci-buildset-registry
-        # 2024.1 Ubuntu Jammy
-        - loci-upload-2024-1-ubuntu_jammy
-        - loci-compute-kit-2024-1-ubuntu_jammy
-        - loci-cinder-2024-1-ubuntu_jammy
-        - loci-promote-2024-1-ubuntu_jammy:
-            dependencies:
-              - name: loci-compute-kit-2024-1-ubuntu_jammy
-              - name: loci-cinder-2024-1-ubuntu_jammy
         # 2024.2 Ubuntu Jammy
         - loci-upload-2024-2-ubuntu_jammy
         - loci-compute-kit-2024-2-ubuntu_jammy
@@ -88,31 +63,16 @@
             dependencies:
               - name: loci-compute-kit-2025-1-ubuntu_noble
               - name: loci-cinder-2025-1-ubuntu_noble
-        # 2025.2 Ubuntu Jammy
-        - loci-upload-2025-2-ubuntu_jammy
-        # - loci-compute-kit-2025-2-ubuntu_jammy
-        # - loci-cinder-2025-2-ubuntu_jammy
-        - loci-promote-2025-2-ubuntu_jammy:
-            dependencies:
-              - name: loci-upload-2025-2-ubuntu_jammy
-              # - name: loci-compute-kit-2025-2-ubuntu_jammy
-              # - name: loci-cinder-2025-2-ubuntu_jammy
         # 2025.2 Ubuntu Noble
         - loci-upload-2025-2-ubuntu_noble
-        # - loci-compute-kit-2025-2-ubuntu_noble
-        # - loci-cinder-2025-2-ubuntu_noble
+        - loci-compute-kit-2025-2-ubuntu_noble
+        - loci-cinder-2025-2-ubuntu_noble
         - loci-promote-2025-2-ubuntu_noble:
             dependencies:
-              - name: loci-upload-2025-2-ubuntu_noble
-              # - name: loci-compute-kit-2025-2-ubuntu_noble
-              # - name: loci-cinder-2025-2-ubuntu_noble
-        # Master Ubuntu Jammy
-        - loci-upload-master-ubuntu_jammy
-        - loci-promote-master-ubuntu_jammy:
-            dependencies:
-              - name: loci-upload-master-ubuntu_jammy
-        # Master Ubuntu Noble
-        - loci-upload-master-ubuntu_noble
-        - loci-promote-master-ubuntu_noble:
-            dependencies:
-              - name: loci-upload-master-ubuntu_noble
+              - name: loci-compute-kit-2025-2-ubuntu_noble
+              - name: loci-cinder-2025-2-ubuntu_noble
+        # # Master Ubuntu Noble
+        # - loci-upload-master-ubuntu_noble
+        # - loci-promote-master-ubuntu_noble:
+        #     dependencies:
+        #       - name: loci-upload-master-ubuntu_noble