diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos
index c2253982..ec201346 100644
--- a/ansible/inventory/group_vars/all/package-repos
+++ b/ansible/inventory/group_vars/all/package-repos
@@ -28,47 +28,13 @@ package_sync_group: ""
 # sync: Whether to sync the repository with a remote. Optional, default is true.
 # publish: Whether to publish and distribute the repository. Optional, default is true.
 deb_package_repos:
-  # Base Ubuntu Focal 20.04 repositories
-  - name: Ubuntu focal
-    url: http://archive.ubuntu.com/ubuntu
-    policy: immediate
-    architectures: amd64
-    components: main restricted universe multiverse
-    # NOTE: Include focal-security here to include all dists under one mirror
-    # path. This allows us to include security updates when using
-    # DIB_DISTRIBUTION_MIRROR with the Diskimage builder ubuntu-minimal
-    # element.
-    distributions: focal focal-updates focal-backports focal-security
-    mirror: true
-    mode: verbatim
-    base_path: ubuntu/focal/
-    short_name: ubuntu_focal
-    sync_group: ubuntu_focal
-    distribution_name: ubuntu-focal-
-
-  # https://wiki.ubuntu.com/SecurityTeam/FAQ suggests that security.ubuntu.com
-  # is preferable for security updates, so use this in preference to the
-  # focal-security dist in the main Ubuntu focal repository where possible.
-  - name: Ubuntu focal security
-    url: http://security.ubuntu.com/ubuntu
-    policy: immediate
-    architectures: amd64
-    components: main restricted universe multiverse
-    distributions: focal-security
-    mirror: true
-    mode: verbatim
-    base_path: ubuntu/focal-security/
-    short_name: ubuntu_focal_security
-    sync_group: ubuntu_focal
-    distribution_name: ubuntu-focal-security-
-
   # Ubuntu Cloud Archive (UCA)
   - name: Ubuntu Cloud Archive
     url: http://ubuntu-cloud.archive.canonical.com/ubuntu
     policy: immediate
     architectures: amd64
     components: main
-    distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal noble-updates/epoxy
+    distributions: jammy-updates/zed jammy-updates/antelope jammy-updates/caracal noble-updates/epoxy
     mirror: true
     mode: verbatim
     base_path: ubuntu-cloud-archive/
@@ -148,19 +114,6 @@ deb_package_repos:
 
   ## Separate repositories for each distribution because
   ## https://github.com/pulp/pulp_deb/issues/921
-  - name: Docker CE for Ubuntu Focal
-    url: https://download.docker.com/linux/ubuntu
-    policy: immediate
-    architectures: amd64
-    distributions: focal
-    components: stable
-    mirror: true
-    mode: verbatim
-    base_path: docker-ce/ubuntu-focal/
-    short_name: docker_ce_ubuntu_focal
-    sync_group: docker
-    distribution_name: docker-ce-for-ubuntu-focal-
-
   - name: Docker CE for Ubuntu Jammy
     url: https://download.docker.com/linux/ubuntu
     policy: immediate
diff --git a/ansible/inventory/group_vars/all/package-repos-deprecated b/ansible/inventory/group_vars/all/package-repos-deprecated
index 31e2af00..29162d93 100644
--- a/ansible/inventory/group_vars/all/package-repos-deprecated
+++ b/ansible/inventory/group_vars/all/package-repos-deprecated
@@ -3,6 +3,91 @@
 # The repos in this file are deprecated and are shown here for reference only
 #############################################################################
 
+###############################################################################
+# Deb
+
+# List of Deb package repositories.
+# Each item is a dict with the following items:
+# name: Repository name.
+# url: URL of upstream package mirror.
+# policy: Policy for upstream remote. Optional.
+# architectures: Architectures to sync.
+# components: Components to sync.
+# distributions: Distributions to sync.
+# mirror: If True, synchronization will remove all content that is not present
+#         in the remote repository. If False, sync will be additive only.
+#         Optional, default is true.
+# mode: Publication mode.
+# base_path: Base path prefix for distributions.
+# short_name: Name used internally for variable names.
+# sync_group: Repos with the same group will be synced at the same time
+# distribution_name: Name prefix for distributions. Version will be appended.
+# sync: Whether to sync the repository with a remote. Optional, default is true.
+# publish: Whether to publish and distribute the repository. Optional, default is true.
+deprecated_deb_package_repos:
+  # Base Ubuntu Focal 20.04 repositories
+  - name: Ubuntu focal
+    url: http://archive.ubuntu.com/ubuntu
+    policy: immediate
+    architectures: amd64
+    components: main restricted universe multiverse
+    # NOTE: Include focal-security here to include all dists under one mirror
+    # path. This allows us to include security updates when using
+    # DIB_DISTRIBUTION_MIRROR with the Diskimage builder ubuntu-minimal
+    # element.
+    distributions: focal focal-updates focal-backports focal-security
+    mirror: true
+    mode: verbatim
+    base_path: ubuntu/focal/
+    short_name: ubuntu_focal
+    sync_group: ubuntu_focal
+    distribution_name: ubuntu-focal-
+
+  # https://wiki.ubuntu.com/SecurityTeam/FAQ suggests that security.ubuntu.com
+  # is preferable for security updates, so use this in preference to the
+  # focal-security dist in the main Ubuntu focal repository where possible.
+  - name: Ubuntu focal security
+    url: http://security.ubuntu.com/ubuntu
+    policy: immediate
+    architectures: amd64
+    components: main restricted universe multiverse
+    distributions: focal-security
+    mirror: true
+    mode: verbatim
+    base_path: ubuntu/focal-security/
+    short_name: ubuntu_focal_security
+    sync_group: ubuntu_focal
+    distribution_name: ubuntu-focal-security-
+
+  # Ubuntu Cloud Archive (UCA)
+  - name: Ubuntu Cloud Archive
+    url: http://ubuntu-cloud.archive.canonical.com/ubuntu
+    policy: immediate
+    architectures: amd64
+    components: main
+    distributions: focal-updates/yoga
+    mirror: true
+    mode: verbatim
+    base_path: ubuntu-cloud-archive/
+    short_name: ubuntu_cloud_archive
+    sync_group: ubuntu_cloud_archive
+    distribution_name: ubuntu-cloud-archive-
+
+  # Docker CE for Ubuntu Focal
+  - name: Docker CE for Ubuntu Focal
+    url: https://download.docker.com/linux/ubuntu
+    policy: immediate
+    architectures: amd64
+    distributions: focal
+    components: stable
+    mirror: true
+    mode: verbatim
+    base_path: docker-ce/ubuntu-focal/
+    short_name: docker_ce_ubuntu_focal
+    sync_group: docker
+    distribution_name: docker-ce-for-ubuntu-focal-
+
+
 # RPM
 
 # List of RPM package repositories.
diff --git a/ansible/validate-deb-repos.yml b/ansible/validate-deb-repos.yml
index f356a831..de4fc975 100644
--- a/ansible/validate-deb-repos.yml
+++ b/ansible/validate-deb-repos.yml
@@ -81,10 +81,9 @@
     - name: Assert that Deb package repository list can be filtered to one group
       ansible.builtin.assert:
         that:
-          - deb_package_repos_filtered | length == 3
-          - deb_package_repos_filtered[0].short_name == 'docker_ce_ubuntu_focal'
-          - deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu_jammy'
-          - deb_package_repos_filtered[2].short_name == 'docker_ce_ubuntu_noble'
+          - deb_package_repos_filtered | length == 2
+          - deb_package_repos_filtered[0].short_name == 'docker_ce_ubuntu_jammy'
+          - deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu_noble'
       vars:
         package_sync_group: docker