diff --git a/data/debian-distro-info.json b/data/debian-distro-info.json
index d305afeb604b4f899f8aa15f5dd74b1998d5db8b..bd17c6da814df8d56c53b98e5a1d78ebf6eb3f0f 100644
--- a/data/debian-distro-info.json
+++ b/data/debian-distro-info.json
@@ -53,7 +53,7 @@
     "series": "sarge",
     "created": "2002-07-19",
     "release": "2005-06-06",
-    "eol": "2008-03-30"
+    "eol": "2008-03-31"
   },
   "v4": {
     "codename": "Etch",
@@ -82,7 +82,7 @@
     "series": "wheezy",
     "created": "2011-02-06",
     "release": "2013-05-04",
-    "eol": "2016-04-26",
+    "eol": "2016-04-25",
     "eol_lts": "2018-05-31",
     "eol_elts": "2020-06-30"
   },
@@ -100,7 +100,7 @@
     "series": "stretch",
     "created": "2015-04-26",
     "release": "2017-06-17",
-    "eol": "2020-07-06",
+    "eol": "2020-07-18",
     "eol_lts": "2022-06-30",
     "eol_elts": "2027-06-30"
   },
@@ -109,7 +109,7 @@
     "series": "buster",
     "created": "2017-06-17",
     "release": "2019-07-06",
-    "eol": "2022-08-14",
+    "eol": "2022-09-10",
     "eol_lts": "2024-06-30",
     "eol_elts": "2029-06-30"
   },
diff --git a/data/node-js-schedule.json b/data/node-js-schedule.json
index 461f5cd1e499bd9d484ede4f688e5ba06b6aa441..c1cf00ead26428e948bc0efb7c53f6b3241901f7 100644
--- a/data/node-js-schedule.json
+++ b/data/node-js-schedule.json
@@ -112,7 +112,7 @@
     "lts": "2023-10-24",
     "maintenance": "2024-10-22",
     "end": "2026-04-30",
-    "codename": ""
+    "codename": "Iron"
   },
   "v21": {
     "start": "2023-10-17",
diff --git a/data/ubuntu-distro-info.json b/data/ubuntu-distro-info.json
index eefc999c8cd187b4d6c01a2665bbbffc07bf07f7..c718afdffe4b71c3e688dfa08e2fa4c671c61ccd 100644
--- a/data/ubuntu-distro-info.json
+++ b/data/ubuntu-distro-info.json
@@ -33,7 +33,7 @@
     "series": "edgy",
     "created": "2006-06-01",
     "release": "2006-10-26",
-    "eol": "2008-04-26"
+    "eol": "2008-04-25"
   },
   "v7.04": {
     "codename": "Feisty Fawn",
@@ -114,7 +114,7 @@
     "release": "2012-04-26",
     "eol": "2017-04-28",
     "eol_server": "2017-04-28",
-    "eol_esm": "2019-04-28"
+    "eol_esm": "2019-04-26"
   },
   "v12.10": {
     "codename": "Quantal Quetzal",
@@ -172,8 +172,8 @@
     "series": "xenial",
     "created": "2015-10-22",
     "release": "2016-04-21",
-    "eol": "2021-04-21",
-    "eol_server": "2021-04-21",
+    "eol": "2021-04-30",
+    "eol_server": "2021-04-30",
     "eol_esm": "2026-04-23"
   },
   "v16.10": {
@@ -286,5 +286,14 @@
     "created": "2023-04-20",
     "release": "2023-10-12",
     "eol": "2024-07-11"
+  },
+  "v24.04": {
+    "codename": "Noble Numbat",
+    "series": "noble",
+    "created": "2023-10-12",
+    "release": "2024-04-25",
+    "eol": "2029-05-31",
+    "eol_server": "2029-05-31",
+    "eol_esm": "2034-04-25"
   }
 }