diff --git a/playbooks/vars_2023.2.yaml b/playbooks/vars_2023.2.yaml
deleted file mode 100644
index 2a462745..00000000
--- a/playbooks/vars_2023.2.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-image_tag: "2023.2-ubuntu_jammy"
-distro_image: "public.ecr.aws/ubuntu/ubuntu:jammy"
-openstack_release: "stable/2023.2"
-ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
-openstack_images:
-  - "{{ barbican_image }}"
-  - "{{ cinder_image }}"
-  - "{{ cyborg_image }}"
-  - "{{ designate_image }}"
-  - "{{ glance_image }}"
-  - "{{ heat_image }}"
-  - "{{ horizon_image }}"
-  - "{{ ironic_image }}"
-  - "{{ keystone_image }}"
-  - "{{ manila_image }}"
-  - "{{ monasca_api_image }}"
-  - "{{ neutron_image }}"
-  - "{{ nova_image }}"
-  - "{{ octavia_image }}"
-  - "{{ openstack_client_image }}"
-  - "{{ placement_image }}"
-  - "{{ tacker_image}}"
-  - "{{ watcher_image }}"
diff --git a/zuul.d/2023.2-ubuntu_jammy.yaml b/zuul.d/2023.2-ubuntu_jammy.yaml
deleted file mode 100644
index 941e6a3f..00000000
--- a/zuul.d/2023.2-ubuntu_jammy.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- job:
-    name: loci-build-2023-2-ubuntu_jammy
-    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_2023.2.yaml
-
-- job:
-    name: loci-upload-2023-2-ubuntu_jammy
-    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-2023-2-ubuntu_jammy
-    run:
-      - playbooks/promote.yaml
-    vars: *vars
-    secrets:
-      name: container_registry_credentials
-      secret: loci_registry_credentials
-    nodeset:
-      nodes: []
-
-- job:
-    name: loci-compute-kit-2023-2-ubuntu_jammy
-    parent: openstack-helm-compute-kit-2023-2-ubuntu_jammy
-    required-projects:
-      - openstack/openstack-helm
-    dependencies:
-      - name: loci-build-2023-2-ubuntu_jammy
-        soft: true
-      - name: loci-upload-2023-2-ubuntu_jammy
-        soft: true
-
-- job:
-    name: loci-cinder-2023-2-ubuntu_jammy
-    parent: openstack-helm-cinder-2023-2-ubuntu_jammy
-    required-projects:
-      - openstack/openstack-helm
-    dependencies:
-      - name: loci-build-2023-2-ubuntu_jammy
-        soft: true
-      - name: loci-upload-2023-2-ubuntu_jammy
-        soft: true
diff --git a/zuul.d/2025.1-ubuntu_jammy.yaml b/zuul.d/2025.1-ubuntu_jammy.yaml
index 1321b953..6a82c84a 100644
--- a/zuul.d/2025.1-ubuntu_jammy.yaml
+++ b/zuul.d/2025.1-ubuntu_jammy.yaml
@@ -39,3 +39,25 @@
       secret: loci_registry_credentials
     nodeset:
       nodes: []
+
+- job:
+    name: loci-compute-kit-2025-1-ubuntu_jammy
+    parent: openstack-helm-compute-kit-2025-1-ubuntu_jammy
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-1-ubuntu_jammy
+        soft: true
+      - name: loci-upload-2025-1-ubuntu_jammy
+        soft: true
+
+- job:
+    name: loci-cinder-2025-1-ubuntu_jammy
+    parent: openstack-helm-cinder-2025-1-ubuntu_jammy
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-1-ubuntu_jammy
+        soft: true
+      - name: loci-upload-2025-1-ubuntu_jammy
+        soft: true
diff --git a/zuul.d/2025.1-ubuntu_noble.yaml b/zuul.d/2025.1-ubuntu_noble.yaml
index c985044a..63b5599c 100644
--- a/zuul.d/2025.1-ubuntu_noble.yaml
+++ b/zuul.d/2025.1-ubuntu_noble.yaml
@@ -39,3 +39,25 @@
       secret: loci_registry_credentials
     nodeset:
       nodes: []
+
+- job:
+    name: loci-compute-kit-2025-1-ubuntu_noble
+    parent: openstack-helm-compute-kit-2025-1-ubuntu_noble
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-1-ubuntu_noble
+        soft: true
+      - name: loci-upload-2025-1-ubuntu_noble
+        soft: true
+
+- job:
+    name: loci-cinder-2025-1-ubuntu_noble
+    parent: openstack-helm-cinder-2025-1-ubuntu_noble
+    required-projects:
+      - openstack/openstack-helm
+    dependencies:
+      - name: loci-build-2025-1-ubuntu_noble
+        soft: true
+      - name: loci-upload-2025-1-ubuntu_noble
+        soft: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 39a819f5..dac599ca 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,10 +2,6 @@
     check:
       jobs:
         - loci-buildset-registry
-        # 2023.2 Ubuntu Jammy
-        - loci-build-2023-2-ubuntu_jammy
-        - loci-compute-kit-2023-2-ubuntu_jammy
-        - loci-cinder-2023-2-ubuntu_jammy
         # 2024.1 Ubuntu Jammy
         - loci-build-2024-1-ubuntu_jammy
         - loci-compute-kit-2024-1-ubuntu_jammy
@@ -16,8 +12,12 @@
         - loci-cinder-2024-2-ubuntu_jammy
         # 2025.1 Ubuntu Jammy
         - loci-build-2025-1-ubuntu_jammy
+        - loci-compute-kit-2025-1-ubuntu_jammy
+        - loci-cinder-2025-1-ubuntu_jammy
         # 2025.1 Ubuntu Noble
         - loci-build-2025-1-ubuntu_noble
+        - loci-compute-kit-2025-1-ubuntu_noble
+        - loci-cinder-2025-1-ubuntu_noble
         # Master Ubuntu Jammy
         - loci-build-master-ubuntu_jammy
         # Master Ubuntu Noble
@@ -25,7 +25,6 @@
     gate:
       jobs:
         - loci-buildset-registry
-        - loci-upload-2023-2-ubuntu_jammy
         - loci-upload-2024-1-ubuntu_jammy
         - loci-upload-2024-2-ubuntu_jammy
         - loci-upload-2025-1-ubuntu_jammy
@@ -34,7 +33,6 @@
         - loci-upload-master-ubuntu_noble
     promote:
       jobs:
-        - loci-promote-2023-2-ubuntu_jammy
         - loci-promote-2024-1-ubuntu_jammy
         - loci-promote-2024-2-ubuntu_jammy
         - loci-promote-2025-1-ubuntu_jammy
@@ -44,14 +42,6 @@
     periodic:
       jobs:
         - loci-buildset-registry
-        # 2023.2 Ubuntu Jammy
-        - loci-upload-2023-2-ubuntu_jammy
-        - loci-compute-kit-2023-2-ubuntu_jammy
-        - loci-cinder-2023-2-ubuntu_jammy
-        - loci-promote-2023-2-ubuntu_jammy:
-            dependencies:
-              - name: loci-compute-kit-2023-2-ubuntu_jammy
-              - name: loci-cinder-2023-2-ubuntu_jammy
         # 2024.1 Ubuntu Jammy
         - loci-upload-2024-1-ubuntu_jammy
         - loci-compute-kit-2024-1-ubuntu_jammy
@@ -70,14 +60,20 @@
               - name: loci-cinder-2024-2-ubuntu_jammy
         # 2025.1 Ubuntu Jammy
         - loci-upload-2025-1-ubuntu_jammy
+        - loci-compute-kit-2025-1-ubuntu_jammy
+        - loci-cinder-2025-1-ubuntu_jammy
         - loci-promote-2025-1-ubuntu_jammy:
             dependencies:
-              - name: loci-upload-2025-1-ubuntu_jammy
+              - name: loci-compute-kit-2025-1-ubuntu_jammy
+              - name: loci-cinder-2025-1-ubuntu_jammy
         # 2025.1 Ubuntu Noble
         - loci-upload-2025-1-ubuntu_noble
+        - loci-compute-kit-2025-1-ubuntu_noble
+        - loci-cinder-2025-1-ubuntu_noble
         - loci-promote-2025-1-ubuntu_noble:
             dependencies:
-              - name: loci-upload-2025-1-ubuntu_noble
+              - name: loci-compute-kit-2025-1-ubuntu_noble
+              - name: loci-cinder-2025-1-ubuntu_noble
         # Master Ubuntu Jammy
         - loci-upload-master-ubuntu_jammy
         - loci-promote-master-ubuntu_jammy: