diff --git a/e2e/testdata/check-upgrade-manifest.json b/e2e/testdata/check-upgrade-manifest.json
index 5fdf761..ab1064d 100644
--- a/e2e/testdata/check-upgrade-manifest.json
+++ b/e2e/testdata/check-upgrade-manifest.json
@@ -2,10 +2,7 @@
   "istio_minor_versions_eol_dates": {
     "1.11": "2022-10-11",
     "1.10": "2022-07-17",
-    "1.9": "2022-04-08",
-    "1.8": "2092-01-18",
-    "1.7": "2021-10-20",
-    "1.6": "2020-11-21"
+    "1.9": "2022-04-08"
   },
   "istio_distributions": [
     {
@@ -13,10 +10,11 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.6/"
@@ -28,10 +26,11 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -43,10 +42,11 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.6/"
@@ -58,10 +58,11 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -73,10 +74,11 @@
       "flavor": "istio",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -88,10 +90,10 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -103,10 +105,10 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -118,10 +120,10 @@
       "flavor": "istio",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -277,139 +279,6 @@
         "https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
       ],
       "is_security_patch": false
-    },
-    {
-      "version": "1.8.6",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.6/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.6",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.6/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.5",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.5/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.5",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.5/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "tetratefips",
-      "flavor_version": 1,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.7.8",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.7.x/announcing-1.7.8/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.7.8",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.7.x/announcing-1.7.8/"
-      ],
-      "is_security_patch": false
     }
   ]
 }
diff --git a/site/manifest.json b/site/manifest.json
index c521557..ab1064d 100644
--- a/site/manifest.json
+++ b/site/manifest.json
@@ -2,10 +2,7 @@
   "istio_minor_versions_eol_dates": {
     "1.11": "2022-10-11",
     "1.10": "2022-07-17",
-    "1.9": "2022-04-08",
-    "1.8": "2022-01-18",
-    "1.7": "2021-10-20",
-    "1.6": "2020-11-21"
+    "1.9": "2022-04-08"
   },
   "istio_distributions": [
     {
@@ -13,10 +10,11 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.6/"
@@ -28,10 +26,11 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -43,10 +42,11 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.6/"
@@ -58,10 +58,11 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -73,10 +74,11 @@
       "flavor": "istio",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21",
+        "1.22"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.11.x/announcing-1.11.3/"
@@ -88,10 +90,10 @@
       "flavor": "tetrate",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -103,10 +105,10 @@
       "flavor": "tetratefips",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -118,10 +120,10 @@
       "flavor": "istio",
       "flavor_version": 0,
       "k8s_versions": [
-        "1.17",
         "1.18",
         "1.19",
-        "1.20"
+        "1.20",
+        "1.21"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.10.x/announcing-1.10.3/"
@@ -277,139 +279,6 @@
         "https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
       ],
       "is_security_patch": false
-    },
-    {
-      "version": "1.8.6",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.6/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.6",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.6/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.5",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.5/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.5",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.5/"
-      ],
-      "is_security_patch": true
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "tetratefips",
-      "flavor_version": 1,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.8.3",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18",
-        "1.19"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.7.8",
-      "flavor": "tetrate",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.7.x/announcing-1.7.8/"
-      ],
-      "is_security_patch": false
-    },
-    {
-      "version": "1.7.8",
-      "flavor": "istio",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.7.x/announcing-1.7.8/"
-      ],
-      "is_security_patch": false
     }
   ]
 }