diff --git a/releases/apache-kafka.json b/releases/apache-kafka.json
index b38cff54..1d17e9c5 100644
--- a/releases/apache-kafka.json
+++ b/releases/apache-kafka.json
@@ -1,5 +1,9 @@
 {
   "releases": {
+    "3.8": {
+      "name": "3.8",
+      "eoes": "2026-11-13"
+    },
     "3.7": {
       "name": "3.7",
       "eoes": "2026-07-26"
@@ -27,10 +31,6 @@
     "3.1": {
       "name": "3.1",
       "eoes": "2024-04-05"
-    },
-    "3.0": {
-      "name": "3.0",
-      "eoes": "2023-10-27"
     }
   },
   "versions": {
diff --git a/releases/pan-gp.json b/releases/pan-gp.json
index 374b5a20..dcf2b066 100644
--- a/releases/pan-gp.json
+++ b/releases/pan-gp.json
@@ -9,7 +9,7 @@
     "6.2": {
       "name": "6.2",
       "releaseDate": "2023-05-23",
-      "eoas": "2025-12-31",
+      "eoas": "2025-05-23",
       "eol": "2025-12-31"
     },
     "6.1": {