diff --git a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
index fb1089a3ac..3cbdde6bc8 100644
--- a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
+++ b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
@@ -3,6 +3,10 @@
     "pattern": "AlmaLinux.* 8",
     "endOfLife": "2029-03-31"
   },
+  {
+    "pattern": "AlmaLinux.* 9",
+    "endOfLife": "2032-05-31"
+  },
   {
     "pattern": "Alpine Linux v3.14",
     "endOfLife": "2023-05-01"
@@ -65,6 +69,10 @@
     "pattern": "Oracle Linux.* 8",
     "endOfLife": "2029-03-31"
   },
+  {
+    "pattern": "Oracle Linux.* 9",
+    "endOfLife": "2034-06-30"
+  },
   {
     "pattern": "Red Hat Enterprise Linux.* 7",
     "start": "2023-05-01",
@@ -74,15 +82,27 @@
     "pattern": "Red Hat Enterprise Linux.* 8",
     "endOfLife": "2029-03-31"
   },
+  {
+    "pattern": "Red Hat Enterprise Linux.* 9",
+    "endOfLife": "2032-05-31"
+  },
   {
     "pattern": "Rocky Linux.* 8",
     "endOfLife": "2029-03-31"
   },
+  {
+    "pattern": "Rocky Linux.* 9",
+    "endOfLife": "2032-05-31"
+  },
   {
     "pattern": "Scientific Linux.* 7",
     "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
+  {
+    "pattern": "Ubuntu.* 16.04",
+    "endOfLife": "2021-04-02"
+  },
   {
     "pattern": "Ubuntu.* 18.04",
     "endOfLife": "2023-05-31"
@@ -91,8 +111,28 @@
     "pattern": "Ubuntu.* 20.04",
     "endOfLife": "2025-04-02"
   },
+  {
+    "pattern": "Ubuntu.* 20.10",
+    "endOfLife": "2021-07-22"
+  },
+  {
+    "pattern": "Ubuntu.* 21.04",
+    "endOfLife": "2022-01-20"
+  },
+  {
+    "pattern": "Ubuntu.* 21.10",
+    "endOfLife": "2022-07-14"
+  },
   {
     "pattern": "Ubuntu.* 22.04",
     "endOfLife": "2027-04-01"
+  },
+  {
+    "pattern": "Ubuntu.* 22.10",
+    "endOfLife": "2023-07-20"
+  },
+  {
+    "pattern": "Ubuntu.* 23.04",
+    "endOfLife": "2024-01-20"
   }
 ]