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 7dfa00bc6772..4eb62c4b49d9 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
@@ -83,6 +83,10 @@
     "pattern": "Fedora.* 40.*",
     "endOfLife": "2025-05-13"
   },
+  {
+    "pattern": "Fedora.* 41.*",
+    "endOfLife": "2025-11-19"
+  },
   {
     "pattern": "Oracle Linux.* 7.*",
     "endOfLife": "2023-11-16"
diff --git a/core/src/test/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitorTest.java b/core/src/test/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitorTest.java
index 84bc3790241a..38a4531613d6 100644
--- a/core/src/test/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitorTest.java
+++ b/core/src/test/java/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitorTest.java
@@ -122,36 +122,7 @@ private String docsUrl(String component) {
     }
 
     private static Stream<Arguments> testReadDocumentationUrls() {
-        return Stream.of(
-            Arguments.of("os-release-alma-8", "AlmaLinux.* 8.*", "AlmaLinux-8.7-Stone-Smilodon"),
-            Arguments.of("os-release-alma-9", "AlmaLinux.* 9.*", "AlmaLinux-9.3-Shamrock-Pampas-Cat"),
-            Arguments.of("os-release-alpine-3.14", "Alpine Linux v3.14", "Alpine-Linux-v3.14"),
-            Arguments.of("os-release-alpine-3.15", "Alpine Linux v3.15", "Alpine-Linux-v3.15"),
-            Arguments.of("os-release-alpine-3.16", "Alpine Linux v3.16", "Alpine-Linux-v3.16"),
-            Arguments.of("os-release-alpine-3.17", "Alpine Linux v3.17", "Alpine-Linux-v3.17"),
-            Arguments.of("os-release-alpine-3.18", "Alpine Linux v3.18", "Alpine-Linux-v3.18"),
-            Arguments.of("os-release-alpine-3.19", "Alpine Linux v3.19", "Alpine-Linux-v3.19"),
-            Arguments.of("os-release-amazon-linux-2", "Amazon Linux 2", "Amazon-Linux-2"),
-            Arguments.of("os-release-amazon-linux-2023", "Amazon Linux 2023", "Amazon-Linux-2023"),
-            Arguments.of("os-release-centos-7", "CentOS Linux.* 7.*", "CentOS-Linux-7-Core"),
-            Arguments.of("os-release-centos-8", "CentOS Linux.* 8.*", "CentOS-Linux-8"),
-            Arguments.of("os-release-debian-10", "Debian.* 10.*", "Debian-GNU-Linux-10-buster"),
-            Arguments.of("os-release-debian-11", "Debian.* 11.*", "Debian-GNU-Linux-11-bullseye"),
-            Arguments.of("os-release-debian-12", "Debian.* 12.*", "Debian-GNU-Linux-12-bookworm"),
-            Arguments.of("os-release-fedora-36", "Fedora.* 36.*", "Fedora-Linux-36-Container-Image"),
-            Arguments.of("os-release-fedora-37", "Fedora.* 37.*", "Fedora-Linux-37-Container-Image"),
-            Arguments.of("os-release-fedora-38", "Fedora.* 38.*", "Fedora-Linux-38-Container-Image"),
-            Arguments.of("os-release-fedora-39", "Fedora.* 39.*", "Fedora-Linux-39-Container-Image"),
-            Arguments.of("os-release-oracle-7", "Oracle Linux.* 7.*", "Oracle-Linux-Server-7.9"),
-            Arguments.of("os-release-oracle-8", "Oracle Linux.* 8.*", "Oracle-Linux-Server-8.7"),
-            Arguments.of("os-release-redhat-7", "Red Hat Enterprise Linux.* 7.*", "Red-Hat-Enterprise-Linux-Server-7.9-Maipo"),
-            Arguments.of("os-release-redhat-8", "Red Hat Enterprise Linux.* 8.*", "Red-Hat-Enterprise-Linux-8.8-Ootpa"),
-            Arguments.of("os-release-rocky-8", "Rocky Linux.* 8.*", "Rocky-Linux-8.7-Green-Obsidian"),
-            Arguments.of("os-release-scientific-7", "Scientific Linux.* 7.*", "Scientific-Linux-7.9-Nitrogen"),
-            Arguments.of("os-release-ubuntu-18.04", "Ubuntu.* 18.*", "Ubuntu-18.04.6-LTS"),
-            Arguments.of("os-release-ubuntu-20.04", "Ubuntu.* 20.*", "Ubuntu-20.04.6-LTS"),
-            Arguments.of("os-release-ubuntu-22.04", "Ubuntu.* 22.*", "Ubuntu-22.04.3-LTS")
-        );
+        return getArguments(true);
     }
 
     @ParameterizedTest
@@ -182,33 +153,7 @@ public void testReadOperatingSystemListNoPattern() {
     }
 
     private static Stream<Arguments> testReadOperatingSystemNames() {
-        return Stream.of(
-            Arguments.of("os-release-alma-8", "AlmaLinux.* 8.*", "AlmaLinux 8.7 (Stone Smilodon)"),
-            Arguments.of("os-release-alma-9", "AlmaLinux.* 9.*", "AlmaLinux 9.3 (Shamrock Pampas Cat)"),
-            Arguments.of("os-release-alpine-3.14", "Alpine Linux v3.14", "Alpine Linux v3.14"),
-            Arguments.of("os-release-alpine-3.15", "Alpine Linux v3.15", "Alpine Linux v3.15"),
-            Arguments.of("os-release-alpine-3.16", "Alpine Linux v3.16", "Alpine Linux v3.16"),
-            Arguments.of("os-release-alpine-3.17", "Alpine Linux v3.17", "Alpine Linux v3.17"),
-            Arguments.of("os-release-alpine-3.18", "Alpine Linux v3.18", "Alpine Linux v3.18"),
-            Arguments.of("os-release-alpine-3.19", "Alpine Linux v3.19", "Alpine Linux v3.19"),
-            Arguments.of("os-release-amazon-linux-2", "Amazon Linux 2", "Amazon Linux 2"),
-            Arguments.of("os-release-amazon-linux-2023", "Amazon Linux 2023", "Amazon Linux 2023"),
-            Arguments.of("os-release-centos-7", "CentOS Linux.* 7.*", "CentOS Linux 7 (Core)"),
-            Arguments.of("os-release-debian-10", "Debian.* 10.*", "Debian GNU/Linux 10 (buster)"),
-            Arguments.of("os-release-debian-11", "Debian.* 11.*", "Debian GNU/Linux 11 (bullseye)"),
-            Arguments.of("os-release-debian-12", "Debian.* 12.*", "Debian GNU/Linux 12 (bookworm)"),
-            Arguments.of("os-release-fedora-36", "Fedora.* 36.*", "Fedora Linux 36 (Container Image)"),
-            Arguments.of("os-release-fedora-37", "Fedora.* 37.*", "Fedora Linux 37 (Container Image)"),
-            Arguments.of("os-release-oracle-7", "Oracle Linux.* 7.*", "Oracle Linux Server 7.9"),
-            Arguments.of("os-release-oracle-8", "Oracle Linux.* 8.*", "Oracle Linux Server 8.7"),
-            Arguments.of("os-release-redhat-7", "Red Hat Enterprise Linux.* 7.*", "Red Hat Enterprise Linux Server 7.9 (Maipo)"),
-            Arguments.of("os-release-redhat-8", "Red Hat Enterprise Linux.* 8.*", "Red Hat Enterprise Linux 8.8 (Ootpa)"),
-            Arguments.of("os-release-rocky-8", "Rocky Linux.* 8.*", "Rocky Linux 8.7 (Green Obsidian)"),
-            Arguments.of("os-release-scientific-7", "Scientific Linux.* 7.*", "Scientific Linux 7.9 (Nitrogen)"),
-            Arguments.of("os-release-ubuntu-18.04", "Ubuntu.* 18.*", "Ubuntu 18.04.6 LTS"),
-            Arguments.of("os-release-ubuntu-20.04", "Ubuntu.* 20.*", "Ubuntu 20.04.6 LTS"),
-            Arguments.of("os-release-ubuntu-22.04", "Ubuntu.* 22.*", "Ubuntu 22.04.3 LTS")
-        );
+        return getArguments(false);
     }
 
     @ParameterizedTest
@@ -239,4 +184,65 @@ public void testReadOperatingSystemListOnWarningDate() throws Exception {
     public void testReadOperatingSystemNameMissingFile() {
         assertThat(monitor.readOperatingSystemName(new File("/this/file/does/not/exist"), ".*"), is(""));
     }
+
+    private static String s(String fullString, boolean simplify) {
+        if (!simplify) {
+            return fullString;
+        }
+        return fullString.replace(" ", "-").replace("/", "-").replace("(", "").replace(")", "");
+    }
+
+    /**
+     * Returns resource file nanme, pattern match for operating system
+     * name, and expected value for each of the resource files used by
+     * the test.
+     *
+     * @param simplifyExpectedValue if true, then the expected value
+     * is simplified by replacing ' ' with '-', by replacing '/' with
+     * '-', and by removing '(' and ')'.
+     * @return arguments for ParameterizedTest, resource file name,
+     * pattern match for operating system name, and expected value
+     */
+    private static Stream<Arguments> getArguments(boolean simplify) {
+        return Stream.of(
+            Arguments.of("os-release-alma-8", "AlmaLinux.* 8.*", s("AlmaLinux 8.10 (Cerulean Leopard)", simplify)),
+            Arguments.of("os-release-alma-9", "AlmaLinux.* 9.*", s("AlmaLinux 9.4 (Seafoam Ocelot)", simplify)),
+            Arguments.of("os-release-alpine-3.14", "Alpine Linux v3.14", s("Alpine Linux v3.14", simplify)),
+            Arguments.of("os-release-alpine-3.15", "Alpine Linux v3.15", s("Alpine Linux v3.15", simplify)),
+            Arguments.of("os-release-alpine-3.16", "Alpine Linux v3.16", s("Alpine Linux v3.16", simplify)),
+            Arguments.of("os-release-alpine-3.17", "Alpine Linux v3.17", s("Alpine Linux v3.17", simplify)),
+            Arguments.of("os-release-alpine-3.18", "Alpine Linux v3.18", s("Alpine Linux v3.18", simplify)),
+            Arguments.of("os-release-alpine-3.19", "Alpine Linux v3.19", s("Alpine Linux v3.19", simplify)),
+            Arguments.of("os-release-alpine-3.20", "Alpine Linux v3.20", s("Alpine Linux v3.20", simplify)),
+            Arguments.of("os-release-amazon-linux-2", "Amazon Linux 2", s("Amazon Linux 2", simplify)),
+            Arguments.of("os-release-amazon-linux-2023", "Amazon Linux 2023.*", s("Amazon Linux 2023.5.20241001", simplify)),
+            Arguments.of("os-release-centos-7", "CentOS Linux.* 7.*", s("CentOS Linux 7 (Core)", simplify)),
+            Arguments.of("os-release-debian-10", "Debian.* 10.*", s("Debian GNU/Linux 10 (buster)", simplify)),
+            Arguments.of("os-release-debian-11", "Debian.* 11.*", s("Debian GNU/Linux 11 (bullseye)", simplify)),
+            Arguments.of("os-release-debian-12", "Debian.* 12.*", s("Debian GNU/Linux 12 (bookworm)", simplify)),
+            Arguments.of("os-release-eurolinux-8", "EuroLinux.* 8.*", s("EuroLinux 8.10 (Bucharest)", simplify)),
+            Arguments.of("os-release-eurolinux-9", "EuroLinux.* 9.*", s("EuroLinux 9.4 (San Marino)", simplify)),
+            Arguments.of("os-release-fedora-36", "Fedora.* 36.*", s("Fedora Linux 36 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-37", "Fedora.* 37.*", s("Fedora Linux 37 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-38", "Fedora.* 38.*", s("Fedora Linux 38 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-39", "Fedora.* 39.*", s("Fedora Linux 39 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-39", "Fedora.* 39.*", s("Fedora Linux 39 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-40", "Fedora.* 40.*", s("Fedora Linux 40 (Container Image)", simplify)),
+            Arguments.of("os-release-fedora-41", "Fedora.* 41.*", s("Fedora Linux 41 (Container Image)", simplify)),
+            Arguments.of("os-release-oracle-7", "Oracle Linux.* 7.*", s("Oracle Linux Server 7.9", simplify)),
+            Arguments.of("os-release-oracle-8", "Oracle Linux.* 8.*", s("Oracle Linux Server 8.10", simplify)),
+            Arguments.of("os-release-oracle-9", "Oracle Linux.* 9.*", s("Oracle Linux Server 9.4", simplify)),
+            Arguments.of("os-release-redhat-7", "Red Hat Enterprise Linux.* 7.*", s("Red Hat Enterprise Linux Server 7.9 (Maipo)", simplify)),
+            Arguments.of("os-release-redhat-8", "Red Hat Enterprise Linux.* 8.*", s("Red Hat Enterprise Linux 8.10 (Ootpa)", simplify)),
+            Arguments.of("os-release-rocky-8", "Rocky Linux.* 8.*", s("Rocky Linux 8.10 (Green Obsidian)", simplify)),
+            Arguments.of("os-release-rocky-9", "Rocky Linux.* 9.*", s("Rocky Linux 9.4 (Blue Onyx)", simplify)),
+            Arguments.of("os-release-scientific-7", "Scientific Linux.* 7.*", s("Scientific Linux 7.9 (Nitrogen)", simplify)),
+            Arguments.of("os-release-ubi-8", "Red Hat Enterprise Linux.* 8.*", s("Red Hat Enterprise Linux 8.10 (Ootpa)", simplify)),
+            Arguments.of("os-release-ubi-9", "Red Hat Enterprise Linux.* 9.*", s("Red Hat Enterprise Linux 9.4 (Plow)", simplify)),
+            Arguments.of("os-release-ubuntu-18.04", "Ubuntu.* 18.*", s("Ubuntu 18.04.6 LTS", simplify)),
+            Arguments.of("os-release-ubuntu-20.04", "Ubuntu.* 20.*", s("Ubuntu 20.04.6 LTS", simplify)),
+            Arguments.of("os-release-ubuntu-22.04", "Ubuntu.* 22.*", s("Ubuntu 22.04.4 LTS", simplify)),
+            Arguments.of("os-release-ubuntu-24.04", "Ubuntu.* 24.*", s("Ubuntu 24.04.1 LTS", simplify))
+        );
+    }
 }
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alma-8 b/core/src/test/resources/jenkins/monitor/os-release-alma-8
index d483909db5b5..6b594068ed3d 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-alma-8
+++ b/core/src/test/resources/jenkins/monitor/os-release-alma-8
@@ -1,10 +1,10 @@
 NAME="AlmaLinux"
-VERSION="8.7 (Stone Smilodon)"
+VERSION="8.10 (Cerulean Leopard)"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="8.7"
+VERSION_ID="8.10"
 PLATFORM_ID="platform:el8"
-PRETTY_NAME="AlmaLinux 8.7 (Stone Smilodon)"
+PRETTY_NAME="AlmaLinux 8.10 (Cerulean Leopard)"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:8::baseos"
@@ -13,6 +13,7 @@ DOCUMENTATION_URL="https://wiki.almalinux.org/"
 BUG_REPORT_URL="https://bugs.almalinux.org/"
 
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-8"
-ALMALINUX_MANTISBT_PROJECT_VERSION="8.7"
+ALMALINUX_MANTISBT_PROJECT_VERSION="8.10"
 REDHAT_SUPPORT_PRODUCT="AlmaLinux"
-REDHAT_SUPPORT_PRODUCT_VERSION="8.7"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
+SUPPORT_END=2029-06-01
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alma-9 b/core/src/test/resources/jenkins/monitor/os-release-alma-9
index d7c856620e81..0310fdd1ea0b 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-alma-9
+++ b/core/src/test/resources/jenkins/monitor/os-release-alma-9
@@ -1,10 +1,10 @@
 NAME="AlmaLinux"
-VERSION="9.3 (Shamrock Pampas Cat)"
+VERSION="9.4 (Seafoam Ocelot)"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="9.3"
+VERSION_ID="9.4"
 PLATFORM_ID="platform:el9"
-PRETTY_NAME="AlmaLinux 9.3 (Shamrock Pampas Cat)"
+PRETTY_NAME="AlmaLinux 9.4 (Seafoam Ocelot)"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos"
@@ -13,6 +13,7 @@ DOCUMENTATION_URL="https://wiki.almalinux.org/"
 BUG_REPORT_URL="https://bugs.almalinux.org/"
 
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9"
-ALMALINUX_MANTISBT_PROJECT_VERSION="9.3"
+ALMALINUX_MANTISBT_PROJECT_VERSION="9.4"
 REDHAT_SUPPORT_PRODUCT="AlmaLinux"
-REDHAT_SUPPORT_PRODUCT_VERSION="9.3"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.4"
+SUPPORT_END=2032-06-01
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.17 b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.17
index 8478d8e8bf32..357834f85742 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.17
+++ b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.17
@@ -1,6 +1,6 @@
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.17.3
+VERSION_ID=3.17.10
 PRETTY_NAME="Alpine Linux v3.17"
 HOME_URL="https://alpinelinux.org/"
 BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.18 b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.18
index a9e1d0057d7b..6dd7e71b9c13 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.18
+++ b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.18
@@ -1,6 +1,6 @@
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.18.0
+VERSION_ID=3.18.9
 PRETTY_NAME="Alpine Linux v3.18"
 HOME_URL="https://alpinelinux.org/"
 BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.19 b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.19
index 0c1a379f5fcf..f3770e65dc2d 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.19
+++ b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.19
@@ -1,6 +1,6 @@
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.19.0
+VERSION_ID=3.19.4
 PRETTY_NAME="Alpine Linux v3.19"
 HOME_URL="https://alpinelinux.org/"
 BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-alpine-3.20 b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.20
new file mode 100644
index 000000000000..843e443cd895
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-alpine-3.20
@@ -0,0 +1,6 @@
+NAME="Alpine Linux"
+ID=alpine
+VERSION_ID=3.20.3
+PRETTY_NAME="Alpine Linux v3.20"
+HOME_URL="https://alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-amazon-linux-2023 b/core/src/test/resources/jenkins/monitor/os-release-amazon-linux-2023
index 97bdcb48a04a..a1bfc87cf06c 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-amazon-linux-2023
+++ b/core/src/test/resources/jenkins/monitor/os-release-amazon-linux-2023
@@ -4,9 +4,13 @@ ID="amzn"
 ID_LIKE="fedora"
 VERSION_ID="2023"
 PLATFORM_ID="platform:al2023"
-PRETTY_NAME="Amazon Linux 2023"
+PRETTY_NAME="Amazon Linux 2023.5.20241001"
 ANSI_COLOR="0;33"
 CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
-HOME_URL="https://aws.amazon.com/linux/"
+HOME_URL="https://aws.amazon.com/linux/amazon-linux-2023/"
+DOCUMENTATION_URL="https://docs.aws.amazon.com/linux/"
+SUPPORT_URL="https://aws.amazon.com/premiumsupport/"
 BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
+VENDOR_NAME="AWS"
+VENDOR_URL="https://aws.amazon.com/"
 SUPPORT_END="2028-03-15"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-eurolinux-8 b/core/src/test/resources/jenkins/monitor/os-release-eurolinux-8
new file mode 100644
index 000000000000..866ff8c05561
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-eurolinux-8
@@ -0,0 +1,14 @@
+NAME="EuroLinux"
+VERSION="8.10 (Bucharest)"
+ID="eurolinux"
+ID_LIKE="rhel fedora centos"
+VERSION_ID="8.10"
+PLATFORM_ID="platform:el8"
+PRETTY_NAME="EuroLinux 8.10 (Bucharest)"
+ANSI_COLOR="0;34"
+CPE_NAME="cpe:/o:eurolinux:eurolinux:8"
+HOME_URL="https://www.euro-linux.com/"
+DOCUMENTATION_URL="https://docs.euro-linux.com/"
+BUG_REPORT_URL="https://github.com/EuroLinux/eurolinux-distro-bugs-and-rfc/"
+REDHAT_SUPPORT_PRODUCT="EuroLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="8"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-eurolinux-9 b/core/src/test/resources/jenkins/monitor/os-release-eurolinux-9
new file mode 100644
index 000000000000..d436181116bb
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-eurolinux-9
@@ -0,0 +1,15 @@
+NAME="EuroLinux"
+VERSION="9.4 (San Marino)"
+ID="eurolinux"
+ID_LIKE="rhel fedora centos"
+VERSION_ID="9.4"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="EuroLinux 9.4 (San Marino)"
+ANSI_COLOR="0;34"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:eurolinux:eurolinux:9"
+HOME_URL="https://www.euro-linux.com/"
+DOCUMENTATION_URL="https://docs.euro-linux.com"
+BUG_REPORT_URL="https://github.com/EuroLinux/eurolinux-distro-bugs-and-rfc/"
+REDHAT_SUPPORT_PRODUCT="EuroLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-fedora-39 b/core/src/test/resources/jenkins/monitor/os-release-fedora-39
index 26c8fbaf0423..9d04f7e3798e 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-fedora-39
+++ b/core/src/test/resources/jenkins/monitor/os-release-fedora-39
@@ -17,6 +17,6 @@ REDHAT_BUGZILLA_PRODUCT="Fedora"
 REDHAT_BUGZILLA_PRODUCT_VERSION=39
 REDHAT_SUPPORT_PRODUCT="Fedora"
 REDHAT_SUPPORT_PRODUCT_VERSION=39
-SUPPORT_END=2024-05-14
+SUPPORT_END=2024-11-12
 VARIANT="Container Image"
 VARIANT_ID=container
diff --git a/core/src/test/resources/jenkins/monitor/os-release-fedora-40 b/core/src/test/resources/jenkins/monitor/os-release-fedora-40
new file mode 100644
index 000000000000..90193fae8e8d
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-fedora-40
@@ -0,0 +1,22 @@
+NAME="Fedora Linux"
+VERSION="40 (Container Image)"
+ID=fedora
+VERSION_ID=40
+VERSION_CODENAME=""
+PLATFORM_ID="platform:f40"
+PRETTY_NAME="Fedora Linux 40 (Container Image)"
+ANSI_COLOR="0;38;2;60;110;180"
+LOGO=fedora-logo-icon
+CPE_NAME="cpe:/o:fedoraproject:fedora:40"
+DEFAULT_HOSTNAME="fedora"
+HOME_URL="https://fedoraproject.org/"
+DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f40/system-administrators-guide/"
+SUPPORT_URL="https://ask.fedoraproject.org/"
+BUG_REPORT_URL="https://bugzilla.redhat.com/"
+REDHAT_BUGZILLA_PRODUCT="Fedora"
+REDHAT_BUGZILLA_PRODUCT_VERSION=40
+REDHAT_SUPPORT_PRODUCT="Fedora"
+REDHAT_SUPPORT_PRODUCT_VERSION=40
+SUPPORT_END=2025-05-13
+VARIANT="Container Image"
+VARIANT_ID=container
diff --git a/core/src/test/resources/jenkins/monitor/os-release-fedora-41 b/core/src/test/resources/jenkins/monitor/os-release-fedora-41
new file mode 100644
index 000000000000..135585f763a5
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-fedora-41
@@ -0,0 +1,23 @@
+NAME="Fedora Linux"
+VERSION="41 (Container Image)"
+RELEASE_TYPE=stable
+ID=fedora
+VERSION_ID=41
+VERSION_CODENAME=""
+PLATFORM_ID="platform:f41"
+PRETTY_NAME="Fedora Linux 41 (Container Image)"
+ANSI_COLOR="0;38;2;60;110;180"
+LOGO=fedora-logo-icon
+CPE_NAME="cpe:/o:fedoraproject:fedora:41"
+DEFAULT_HOSTNAME="fedora"
+HOME_URL="https://fedoraproject.org/"
+DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f41/system-administrators-guide/"
+SUPPORT_URL="https://ask.fedoraproject.org/"
+BUG_REPORT_URL="https://bugzilla.redhat.com/"
+REDHAT_BUGZILLA_PRODUCT="Fedora"
+REDHAT_BUGZILLA_PRODUCT_VERSION=41
+REDHAT_SUPPORT_PRODUCT="Fedora"
+REDHAT_SUPPORT_PRODUCT_VERSION=41
+SUPPORT_END=2025-05-13
+VARIANT="Container Image"
+VARIANT_ID=container
diff --git a/core/src/test/resources/jenkins/monitor/os-release-oracle-8 b/core/src/test/resources/jenkins/monitor/os-release-oracle-8
index b91c366e47ac..81c29c076b26 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-oracle-8
+++ b/core/src/test/resources/jenkins/monitor/os-release-oracle-8
@@ -1,18 +1,18 @@
 NAME="Oracle Linux Server"
-VERSION="8.7"
+VERSION="8.10"
 ID="ol"
 ID_LIKE="fedora"
 VARIANT="Server"
 VARIANT_ID="server"
-VERSION_ID="8.7"
+VERSION_ID="8.10"
 PLATFORM_ID="platform:el8"
-PRETTY_NAME="Oracle Linux Server 8.7"
+PRETTY_NAME="Oracle Linux Server 8.10"
 ANSI_COLOR="0;31"
-CPE_NAME="cpe:/o:oracle:linux:8:7:server"
+CPE_NAME="cpe:/o:oracle:linux:8:10:server"
 HOME_URL="https://linux.oracle.com/"
-BUG_REPORT_URL="https://bugzilla.oracle.com/"
+BUG_REPORT_URL="https://github.com/oracle/oracle-linux"
 
 ORACLE_BUGZILLA_PRODUCT="Oracle Linux 8"
-ORACLE_BUGZILLA_PRODUCT_VERSION=8.7
+ORACLE_BUGZILLA_PRODUCT_VERSION=8.10
 ORACLE_SUPPORT_PRODUCT="Oracle Linux"
-ORACLE_SUPPORT_PRODUCT_VERSION=8.7
+ORACLE_SUPPORT_PRODUCT_VERSION=8.10
diff --git a/core/src/test/resources/jenkins/monitor/os-release-oracle-9 b/core/src/test/resources/jenkins/monitor/os-release-oracle-9
new file mode 100644
index 000000000000..2de011e2b755
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-oracle-9
@@ -0,0 +1,18 @@
+NAME="Oracle Linux Server"
+VERSION="9.4"
+ID="ol"
+ID_LIKE="fedora"
+VARIANT="Server"
+VARIANT_ID="server"
+VERSION_ID="9.4"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="Oracle Linux Server 9.4"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:oracle:linux:9:4:server"
+HOME_URL="https://linux.oracle.com/"
+BUG_REPORT_URL="https://github.com/oracle/oracle-linux"
+
+ORACLE_BUGZILLA_PRODUCT="Oracle Linux 9"
+ORACLE_BUGZILLA_PRODUCT_VERSION=9.4
+ORACLE_SUPPORT_PRODUCT="Oracle Linux"
+ORACLE_SUPPORT_PRODUCT_VERSION=9.4
diff --git a/core/src/test/resources/jenkins/monitor/os-release-redhat-8 b/core/src/test/resources/jenkins/monitor/os-release-redhat-8
index 2fafad589d61..44a109a3eefb 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-redhat-8
+++ b/core/src/test/resources/jenkins/monitor/os-release-redhat-8
@@ -1,17 +1,17 @@
 NAME="Red Hat Enterprise Linux"
-VERSION="8.8 (Ootpa)"
+VERSION="8.10 (Ootpa)"
 ID="rhel"
 ID_LIKE="fedora"
-VERSION_ID="8.8"
+VERSION_ID="8.10"
 PLATFORM_ID="platform:el8"
-PRETTY_NAME="Red Hat Enterprise Linux 8.8 (Ootpa)"
+PRETTY_NAME="Red Hat Enterprise Linux 8.10 (Ootpa)"
 ANSI_COLOR="0;31"
 CPE_NAME="cpe:/o:redhat:enterprise_linux:8::baseos"
 HOME_URL="https://www.redhat.com/"
 DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8"
-BUG_REPORT_URL="https://bugzilla.redhat.com/"
+BUG_REPORT_URL="https://issues.redhat.com/"
 
 REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 8"
-REDHAT_BUGZILLA_PRODUCT_VERSION=8.8
+REDHAT_BUGZILLA_PRODUCT_VERSION=8.10
 REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
-REDHAT_SUPPORT_PRODUCT_VERSION="8.8"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-rocky-8 b/core/src/test/resources/jenkins/monitor/os-release-rocky-8
index 2fd5d0f4bcc6..514ac1171048 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-rocky-8
+++ b/core/src/test/resources/jenkins/monitor/os-release-rocky-8
@@ -1,16 +1,17 @@
 NAME="Rocky Linux"
-VERSION="8.7 (Green Obsidian)"
+VERSION="8.10 (Green Obsidian)"
 ID="rocky"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="8.7"
+VERSION_ID="8.10"
 PLATFORM_ID="platform:el8"
-PRETTY_NAME="Rocky Linux 8.7 (Green Obsidian)"
+PRETTY_NAME="Rocky Linux 8.10 (Green Obsidian)"
 ANSI_COLOR="0;32"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:rocky:rocky:8:GA"
 HOME_URL="https://rockylinux.org/"
 BUG_REPORT_URL="https://bugs.rockylinux.org/"
+SUPPORT_END="2029-05-31"
 ROCKY_SUPPORT_PRODUCT="Rocky-Linux-8"
-ROCKY_SUPPORT_PRODUCT_VERSION="8.7"
+ROCKY_SUPPORT_PRODUCT_VERSION="8.10"
 REDHAT_SUPPORT_PRODUCT="Rocky Linux"
-REDHAT_SUPPORT_PRODUCT_VERSION="8.7"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-rocky-9 b/core/src/test/resources/jenkins/monitor/os-release-rocky-9
new file mode 100644
index 000000000000..637ae1a12926
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-rocky-9
@@ -0,0 +1,17 @@
+NAME="Rocky Linux"
+VERSION="9.4 (Blue Onyx)"
+ID="rocky"
+ID_LIKE="rhel centos fedora"
+VERSION_ID="9.4"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="Rocky Linux 9.4 (Blue Onyx)"
+ANSI_COLOR="0;32"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:rocky:rocky:9::baseos"
+HOME_URL="https://rockylinux.org/"
+BUG_REPORT_URL="https://bugs.rockylinux.org/"
+SUPPORT_END="2032-05-31"
+ROCKY_SUPPORT_PRODUCT="Rocky-Linux-9"
+ROCKY_SUPPORT_PRODUCT_VERSION="9.4"
+REDHAT_SUPPORT_PRODUCT="Rocky Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.4"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-ubi-8 b/core/src/test/resources/jenkins/monitor/os-release-ubi-8
new file mode 100644
index 000000000000..44a109a3eefb
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-ubi-8
@@ -0,0 +1,17 @@
+NAME="Red Hat Enterprise Linux"
+VERSION="8.10 (Ootpa)"
+ID="rhel"
+ID_LIKE="fedora"
+VERSION_ID="8.10"
+PLATFORM_ID="platform:el8"
+PRETTY_NAME="Red Hat Enterprise Linux 8.10 (Ootpa)"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:redhat:enterprise_linux:8::baseos"
+HOME_URL="https://www.redhat.com/"
+DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8"
+BUG_REPORT_URL="https://issues.redhat.com/"
+
+REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 8"
+REDHAT_BUGZILLA_PRODUCT_VERSION=8.10
+REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="8.10"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-ubi-9 b/core/src/test/resources/jenkins/monitor/os-release-ubi-9
new file mode 100644
index 000000000000..66458c5674e2
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-ubi-9
@@ -0,0 +1,18 @@
+NAME="Red Hat Enterprise Linux"
+VERSION="9.4 (Plow)"
+ID="rhel"
+ID_LIKE="fedora"
+VERSION_ID="9.4"
+PLATFORM_ID="platform:el9"
+PRETTY_NAME="Red Hat Enterprise Linux 9.4 (Plow)"
+ANSI_COLOR="0;31"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos"
+HOME_URL="https://www.redhat.com/"
+DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9"
+BUG_REPORT_URL="https://issues.redhat.com/"
+
+REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
+REDHAT_BUGZILLA_PRODUCT_VERSION=9.4
+REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="9.4"
diff --git a/core/src/test/resources/jenkins/monitor/os-release-ubuntu-22.04 b/core/src/test/resources/jenkins/monitor/os-release-ubuntu-22.04
index 39240aa54b81..9027a5785123 100644
--- a/core/src/test/resources/jenkins/monitor/os-release-ubuntu-22.04
+++ b/core/src/test/resources/jenkins/monitor/os-release-ubuntu-22.04
@@ -1,7 +1,7 @@
-PRETTY_NAME="Ubuntu 22.04.3 LTS"
+PRETTY_NAME="Ubuntu 22.04.4 LTS"
 NAME="Ubuntu"
 VERSION_ID="22.04"
-VERSION="22.04.3 LTS (Jammy Jellyfish)"
+VERSION="22.04.4 LTS (Jammy Jellyfish)"
 VERSION_CODENAME=jammy
 ID=ubuntu
 ID_LIKE=debian
diff --git a/core/src/test/resources/jenkins/monitor/os-release-ubuntu-24.04 b/core/src/test/resources/jenkins/monitor/os-release-ubuntu-24.04
new file mode 100644
index 000000000000..18cf4770e81a
--- /dev/null
+++ b/core/src/test/resources/jenkins/monitor/os-release-ubuntu-24.04
@@ -0,0 +1,13 @@
+PRETTY_NAME="Ubuntu 24.04.1 LTS"
+NAME="Ubuntu"
+VERSION_ID="24.04"
+VERSION="24.04.1 LTS (Noble Numbat)"
+VERSION_CODENAME=noble
+ID=ubuntu
+ID_LIKE=debian
+HOME_URL="https://www.ubuntu.com/"
+SUPPORT_URL="https://help.ubuntu.com/"
+BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+UBUNTU_CODENAME=noble
+LOGO=ubuntu-logo