diff --git a/assets/matrix.json b/assets/matrix.json
index 915f6e9245..a0480a0d31 100644
--- a/assets/matrix.json
+++ b/assets/matrix.json
@@ -1,16 +1,29 @@
 {
   "lts": [
+    {
+      "Architecture": "amd64",
+      "Channel": "lts",
+      "ContinueOnError": false,
+      "DistributionState": "Validated",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "ubuntu20.04",
+      "IsLinux": true,
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "UseInCI": true
+    },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine316",
+      "ImageName": "alpine317",
       "IsLinux": true,
-      "JobName": "alpine316",
-      "OsVersion": "Alpine 3.16 (In Validation)",
-      "TagList": "lts-7.2-alpine-3.16;lts-alpine-3.16",
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "lts-7.2-alpine-3.17;lts-alpine-3.17",
       "UseInCI": false
     },
     {
@@ -26,19 +39,6 @@
       "TagList": "lts-7.2-mariner-2.0;lts-mariner-2.0",
       "UseInCI": true
     },
-    {
-      "Architecture": "amd64",
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
-      "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (End of Life)",
-      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
-      "UseInCI": true
-    },
     {
       "Architecture": "amd64",
       "Channel": "lts",
@@ -52,56 +52,43 @@
       "TagList": "lts-7.2-ubuntu-jammy;lts-7.2-ubuntu-22.04;lts-ubuntu-jammy;lts-ubuntu-22.04",
       "UseInCI": true
     },
-    {
-      "Architecture": "amd64",
-      "Channel": "lts",
-      "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine317",
-      "IsLinux": true,
-      "JobName": "alpine317",
-      "OsVersion": "Alpine 3.17 (In Validation)",
-      "TagList": "lts-7.2-alpine-3.17;lts-alpine-3.17",
-      "UseInCI": false
-    },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-06-01T00:00:00",
-      "ImageName": "debian10",
+      "EndOfLife": "2024-11-30T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian10",
-      "OsVersion": "Debian 10",
-      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14 (End of Life)",
-      "TagList": "lts-7.2-alpine-3.14;lts-alpine-3.14",
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "lts-7.2-alpine-3.16;lts-alpine-3.16",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "lts",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "lts-7.2-debian-bullseye-slim;lts-7.2-debian-11;lts-debian-bullseye-slim;lts-debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
+      "TagList": "lts-7.2-ubi-8;lts-ubi-8",
       "UseInCI": true
     },
     {
@@ -109,12 +96,12 @@
       "Channel": "lts",
       "ContinueOnError": false,
       "DistributionState": "Validated",
-      "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "EndOfLife": "2024-06-01T00:00:00",
+      "ImageName": "debian10",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "lts-7.2-ubuntu-focal;lts-7.2-ubuntu-20.04;lts-ubuntu-focal;lts-ubuntu-20.04",
+      "JobName": "debian10",
+      "OsVersion": "Debian 10",
+      "TagList": "lts-7.2-debian-buster-slim;lts-7.2-debian-10;lts-debian-buster-slim;lts-debian-10",
       "UseInCI": true
     },
     {
@@ -123,11 +110,11 @@
       "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu22.04-arm32v7",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu22.04_arm32v7",
-      "OsVersion": "Ubuntu 22.04 ARM 32v7 (End of Life)",
-      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
+      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
@@ -136,11 +123,11 @@
       "ContinueOnError": false,
       "DistributionState": "EndOfLife",
       "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
+      "ImageName": "ubuntu22.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
-      "TagList": "lts-7.2-ubuntu-focal-arm32;lts-7.2-ubuntu-20.04-arm32;lts-ubuntu-focal-arm32;lts-ubuntu-20.04-arm32",
+      "JobName": "ubuntu22.04_arm32v7",
+      "OsVersion": "Ubuntu 22.04 ARM 32v7 (End of Life)",
+      "TagList": "lts-7.2-ubuntu-jammy-arm32;lts-7.2-ubuntu-22.04-arm32;lts-ubuntu-jammy-arm32;lts-ubuntu-22.04-arm32",
       "UseInCI": false
     },
     {
@@ -162,11 +149,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -175,11 +162,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "lts-7.2-nanoserver-ltsc2022;lts-nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -188,11 +175,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2024-11-30T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "lts-7.2-windowsserver-ltsc2022;lts-windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "lts-7.2-windowsservercore-ltsc2022;lts-windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -203,12 +190,12 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "preview-7.4-ubuntu-jammy;preview-7.4-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
-      "UseInCI": true
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "preview-7.4-ubuntu-focal;preview-7.4-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
@@ -216,26 +203,13 @@
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine316",
+      "ImageName": "alpine317",
       "IsLinux": true,
-      "JobName": "alpine316",
-      "OsVersion": "Alpine 3.16 (In Validation)",
-      "TagList": "preview-7.4-alpine-3.16;preview-alpine-3.16",
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.17;preview-alpine-3.17",
       "UseInCI": false
     },
-    {
-      "Architecture": "amd64",
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
-      "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9 (End of Life)",
-      "TagList": "preview-7.4-ubi-9;preview-ubi-9",
-      "UseInCI": true
-    },
     {
       "Architecture": "amd64",
       "Channel": "preview",
@@ -253,26 +227,26 @@
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (End of Life)",
-      "TagList": "preview-7.4-ubi-8;preview-ubi-8",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "preview-7.4-ubuntu-jammy;preview-7.4-ubuntu-22.04;preview-ubuntu-jammy;preview-ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2025-12-25T00:00:00",
-      "ImageName": "debian12",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian12",
-      "OsVersion": "Debian 12 (In Validation)",
-      "TagList": "preview-7.4-debian-bookworm;preview-7.4-debian-12;preview-debian-bookworm;preview-debian-12",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "preview-7.4-debian-bullseye-slim;preview-7.4-debian-11;preview-debian-bullseye-slim;preview-debian-11",
       "UseInCI": true
     },
     {
@@ -281,11 +255,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "preview-7.4-alpine-3.15;preview-alpine-3.15",
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.16;preview-alpine-3.16",
       "UseInCI": false
     },
     {
@@ -293,13 +267,26 @@
       "Channel": "preview",
       "ContinueOnError": false,
       "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine317",
+      "EndOfLife": "2025-12-25T00:00:00",
+      "ImageName": "debian12",
       "IsLinux": true,
-      "JobName": "alpine317",
-      "OsVersion": "Alpine 3.17 (In Validation)",
-      "TagList": "preview-7.4-alpine-3.17;preview-alpine-3.17",
-      "UseInCI": false
+      "JobName": "debian12",
+      "OsVersion": "Debian 12 (In Validation)",
+      "TagList": "preview-7.4-debian-bookworm;preview-7.4-debian-12;preview-debian-bookworm;preview-debian-12",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "preview",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9 (End of Life)",
+      "TagList": "preview-7.4-ubi-9;preview-ubi-9",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
@@ -318,39 +305,39 @@
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14 (End of Life)",
-      "TagList": "preview-7.4-alpine-3.14;preview-alpine-3.14",
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "preview-7.4-alpine-3.15;preview-alpine-3.15",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "preview-7.4-debian-bullseye-slim;preview-7.4-debian-11;preview-debian-bullseye-slim;preview-debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
+      "TagList": "preview-7.4-ubi-8;preview-ubi-8",
       "UseInCI": true
     },
     {
-      "Architecture": "amd64",
+      "Architecture": "arm32",
       "Channel": "preview",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "preview-7.4-ubuntu-focal;preview-7.4-ubuntu-20.04;preview-ubuntu-focal;preview-ubuntu-20.04",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
+      "TagList": "preview-7.4-ubuntu-focal-arm32;preview-7.4-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
@@ -366,19 +353,6 @@
       "TagList": "preview-7.4-ubuntu-jammy-arm32;preview-7.4-ubuntu-22.04-arm32;preview-ubuntu-jammy-arm32;preview-ubuntu-22.04-arm32",
       "UseInCI": false
     },
-    {
-      "Architecture": "arm32",
-      "Channel": "preview",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
-      "TagList": "preview-7.4-ubuntu-focal-arm32;preview-7.4-ubuntu-20.04-arm32;preview-ubuntu-focal-arm32;preview-ubuntu-20.04-arm32",
-      "UseInCI": false
-    },
     {
       "Architecture": "arm64",
       "Channel": "preview",
@@ -398,11 +372,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "preview-7.4-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "preview-7.4-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
       "UseInCI": true
     },
     {
@@ -411,11 +385,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "preview-7.4-windowsservercore-ltsc2022;preview-windowsservercore-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "preview-7.4-windowsserver-ltsc2022;preview-windowsserver-ltsc2022",
       "UseInCI": true
     }
   ],
@@ -426,12 +400,12 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu22.04",
+      "ImageName": "ubuntu20.04",
       "IsLinux": true,
-      "JobName": "ubuntu22.04",
-      "OsVersion": "Ubuntu 22.04",
-      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
-      "UseInCI": true
+      "JobName": "ubuntu20.04",
+      "OsVersion": "Ubuntu 20.04",
+      "TagList": "7.3-ubuntu-focal;7.3-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "UseInCI": false
     },
     {
       "Architecture": "amd64",
@@ -439,26 +413,13 @@
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine316",
+      "ImageName": "alpine317",
       "IsLinux": true,
-      "JobName": "alpine316",
-      "OsVersion": "Alpine 3.16 (In Validation)",
-      "TagList": "7.3-alpine-3.16;alpine-3.16",
+      "JobName": "alpine317",
+      "OsVersion": "Alpine 3.17 (In Validation)",
+      "TagList": "7.3-alpine-3.17;alpine-3.17",
       "UseInCI": false
     },
-    {
-      "Architecture": "amd64",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi9",
-      "IsLinux": true,
-      "JobName": "ubi9",
-      "OsVersion": "Universal Base Image 9 (End of Life)",
-      "TagList": "7.3-ubi-9;ubi-9",
-      "UseInCI": true
-    },
     {
       "Architecture": "amd64",
       "Channel": "stable",
@@ -476,26 +437,26 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-30T00:00:00",
-      "ImageName": "ubi8",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "ubuntu22.04",
       "IsLinux": true,
-      "JobName": "ubi8",
-      "OsVersion": "Universal Base Image 8 (End of Life)",
-      "TagList": "7.3-ubi-8;ubi-8",
+      "JobName": "ubuntu22.04",
+      "OsVersion": "Ubuntu 22.04",
+      "TagList": "7.3-ubuntu-jammy;7.3-ubuntu-22.04;ubuntu-jammy;ubuntu-22.04",
       "UseInCI": true
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validating",
-      "EndOfLife": "2025-12-25T00:00:00",
-      "ImageName": "debian12",
+      "DistributionState": "Validated",
+      "EndOfLife": "2023-12-15T00:00:00",
+      "ImageName": "debian11",
       "IsLinux": true,
-      "JobName": "debian12",
-      "OsVersion": "Debian 12 (In Validation)",
-      "TagList": "7.3-debian-bookworm;7.3-debian-12;debian-bookworm;debian-12",
+      "JobName": "debian11",
+      "OsVersion": "Debian 11",
+      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
       "UseInCI": true
     },
     {
@@ -504,11 +465,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validating",
       "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine315",
+      "ImageName": "alpine316",
       "IsLinux": true,
-      "JobName": "alpine315",
-      "OsVersion": "Alpine 3.15 (In Validation)",
-      "TagList": "7.3-alpine-3.15;alpine-3.15",
+      "JobName": "alpine316",
+      "OsVersion": "Alpine 3.16 (In Validation)",
+      "TagList": "7.3-alpine-3.16;alpine-3.16",
       "UseInCI": false
     },
     {
@@ -516,13 +477,26 @@
       "Channel": "stable",
       "ContinueOnError": false,
       "DistributionState": "Validating",
-      "EndOfLife": "2023-11-01T00:00:00",
-      "ImageName": "alpine317",
+      "EndOfLife": "2025-12-25T00:00:00",
+      "ImageName": "debian12",
       "IsLinux": true,
-      "JobName": "alpine317",
-      "OsVersion": "Alpine 3.17 (In Validation)",
-      "TagList": "7.3-alpine-3.17;alpine-3.17",
-      "UseInCI": false
+      "JobName": "debian12",
+      "OsVersion": "Debian 12 (In Validation)",
+      "TagList": "7.3-debian-bookworm;7.3-debian-12;debian-bookworm;debian-12",
+      "UseInCI": true
+    },
+    {
+      "Architecture": "amd64",
+      "Channel": "stable",
+      "ContinueOnError": false,
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi9",
+      "IsLinux": true,
+      "JobName": "ubi9",
+      "OsVersion": "Universal Base Image 9 (End of Life)",
+      "TagList": "7.3-ubi-9;ubi-9",
+      "UseInCI": true
     },
     {
       "Architecture": "amd64",
@@ -541,39 +515,39 @@
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-05-01T00:00:00",
-      "ImageName": "alpine314",
+      "DistributionState": "Validating",
+      "EndOfLife": "2023-11-01T00:00:00",
+      "ImageName": "alpine315",
       "IsLinux": true,
-      "JobName": "alpine314",
-      "OsVersion": "Alpine 3.14 (End of Life)",
-      "TagList": "7.3-alpine-3.14;alpine-3.14",
+      "JobName": "alpine315",
+      "OsVersion": "Alpine 3.15 (In Validation)",
+      "TagList": "7.3-alpine-3.15;alpine-3.15",
       "UseInCI": false
     },
     {
       "Architecture": "amd64",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "debian11",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-05-30T00:00:00",
+      "ImageName": "ubi8",
       "IsLinux": true,
-      "JobName": "debian11",
-      "OsVersion": "Debian 11",
-      "TagList": "7.3-debian-bullseye-slim;7.3-debian-11;debian-bullseye-slim;debian-11",
+      "JobName": "ubi8",
+      "OsVersion": "Universal Base Image 8 (End of Life)",
+      "TagList": "7.3-ubi-8;ubi-8",
       "UseInCI": true
     },
     {
-      "Architecture": "amd64",
+      "Architecture": "arm32",
       "Channel": "stable",
       "ContinueOnError": false,
-      "DistributionState": "Validated",
-      "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "ubuntu20.04",
+      "DistributionState": "EndOfLife",
+      "EndOfLife": "2023-04-02T00:00:00",
+      "ImageName": "ubuntu20.04-arm32v7",
       "IsLinux": true,
-      "JobName": "ubuntu20.04",
-      "OsVersion": "Ubuntu 20.04",
-      "TagList": "7.3-ubuntu-focal;7.3-ubuntu-20.04;ubuntu-focal;ubuntu-20.04",
+      "JobName": "ubuntu20.04_arm32v7",
+      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
+      "TagList": "7.3-ubuntu-focal-arm32;7.3-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
       "UseInCI": false
     },
     {
@@ -589,19 +563,6 @@
       "TagList": "7.3-ubuntu-jammy-arm32;7.3-ubuntu-22.04-arm32;ubuntu-jammy-arm32;ubuntu-22.04-arm32",
       "UseInCI": false
     },
-    {
-      "Architecture": "arm32",
-      "Channel": "stable",
-      "ContinueOnError": false,
-      "DistributionState": "EndOfLife",
-      "EndOfLife": "2023-04-02T00:00:00",
-      "ImageName": "ubuntu20.04-arm32v7",
-      "IsLinux": true,
-      "JobName": "ubuntu20.04_arm32v7",
-      "OsVersion": "Ubuntu 20.04 ARM 32v7 (End of Life)",
-      "TagList": "7.3-ubuntu-focal-arm32;7.3-ubuntu-20.04-arm32;ubuntu-focal-arm32;ubuntu-20.04-arm32",
-      "UseInCI": false
-    },
     {
       "Architecture": "arm64",
       "Channel": "stable",
@@ -634,11 +595,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsservercore2022",
+      "ImageName": "nanoserver2022",
       "IsLinux": false,
-      "JobName": "windowsservercore2022",
-      "OsVersion": "Windows Server Core, LTSC 2022",
-      "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
+      "JobName": "nanoserver2022",
+      "OsVersion": "Nano Server, LTSC 2022",
+      "TagList": "7.3-nanoserver-ltsc2022;nanoserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -647,11 +608,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "nanoserver2022",
+      "ImageName": "windowsserver2022",
       "IsLinux": false,
-      "JobName": "nanoserver2022",
-      "OsVersion": "Nano Server, LTSC 2022",
-      "TagList": "7.3-nanoserver-ltsc2022;nanoserver-ltsc2022",
+      "JobName": "windowsserver2022",
+      "OsVersion": "Windows Server, LTSC 2022",
+      "TagList": "7.3-windowsserver-ltsc2022;windowsserver-ltsc2022",
       "UseInCI": true
     },
     {
@@ -660,11 +621,11 @@
       "ContinueOnError": false,
       "DistributionState": "Validated",
       "EndOfLife": "2023-12-15T00:00:00",
-      "ImageName": "windowsserver2022",
+      "ImageName": "windowsservercore2022",
       "IsLinux": false,
-      "JobName": "windowsserver2022",
-      "OsVersion": "Windows Server, LTSC 2022",
-      "TagList": "7.3-windowsserver-ltsc2022;windowsserver-ltsc2022",
+      "JobName": "windowsservercore2022",
+      "OsVersion": "Windows Server Core, LTSC 2022",
+      "TagList": "7.3-windowsservercore-ltsc2022;windowsservercore-ltsc2022",
       "UseInCI": true
     }
   ]