diff --git a/static/data/sample-badges.json b/static/data/sample-badges.json
index da7240fd18..4d2be34bf7 100644
--- a/static/data/sample-badges.json
+++ b/static/data/sample-badges.json
@@ -1,75 +1,84 @@
 [
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "industrialedge-aws-4.18-stable-badge.json",
-        "pattern": "industrialedge",
+        "key": "aegitops-aws-4.18-stable-badge.json",
+        "pattern": "aegitops",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-16"
+        "date": "2026-04-28"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopshcp-aws-4.20-stable-badge.json",
-        "pattern": "mcgitopshcp",
+        "key": "aegitops-aws-4.20-stable-badge.json",
+        "pattern": "aegitops",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-15"
+        "date": "2026-04-21"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "ragllm-aws-4.21-stable-badge.json",
-        "pattern": "ragllm",
+        "key": "aegitops-aws-4.21-stable-badge.json",
+        "pattern": "aegitops",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-15"
+        "date": "2026-04-28"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "ragllm-azr-4.20-stable-badge.json",
-        "pattern": "ragllm",
-        "platform": "azr",
+        "key": "agof-aws-none-stable-badge.json",
+        "pattern": "agof",
+        "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-15"
+        "version": "none",
+        "date": "2026-04-21"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "aegitops-aws-4.18-stable-badge.json",
-        "pattern": "aegitops",
-        "platform": "aws",
+        "key": "coco-azr-4.18-stable-badge.json",
+        "pattern": "coco",
+        "platform": "azr",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-14"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "aegitops-aws-4.21-stable-badge.json",
-        "pattern": "aegitops",
-        "platform": "aws",
+        "key": "coco-azr-4.20-stable-badge.json",
+        "pattern": "coco",
+        "platform": "azr",
+        "operator": "N/A",
+        "version": "4.20",
+        "date": "2026-04-17"
+    },
+    {
+        "base": "https://storage.googleapis.com/vp-results",
+        "key": "coco-azr-4.21-stable-badge.json",
+        "pattern": "coco",
+        "platform": "azr",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-14"
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "hypershift-aws-4.20-stable-badge.json",
+        "key": "hypershift-aws-4.18-stable-badge.json",
         "pattern": "hypershift",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-14"
+        "version": "4.18",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "medicaldiag-aws-4.18-stable-badge.json",
-        "pattern": "medicaldiag",
+        "key": "hypershift-aws-4.20-stable-badge.json",
+        "pattern": "hypershift",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-14"
+        "version": "4.20",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
@@ -78,277 +87,259 @@
         "platform": "aws",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-13"
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-aws-4.21-stable-badge.json",
-        "pattern": "mcgitops",
+        "key": "industrialedge-aws-4.18-stable-badge.json",
+        "pattern": "industrialedge",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-13"
+        "version": "4.18",
+        "date": "2026-04-29"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "medicaldiag-aws-4.21-stable-badge.json",
-        "pattern": "medicaldiag",
+        "key": "industrialedge-aws-4.21-stable-badge.json",
+        "pattern": "industrialedge",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-13"
+        "date": "2026-02-27"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "medicaldiag-azr-4.20-stable-badge.json",
-        "pattern": "medicaldiag",
+        "key": "industrialedge-azr-4.20-stable-badge.json",
+        "pattern": "industrialedge",
         "platform": "azr",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-13"
+        "date": "2026-04-23"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-intel-4.18-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "intel",
-        "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-12"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-intel-4.20-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "intel",
+        "key": "layeredzerotrust-aws-4.20-stable-badge.json",
+        "pattern": "layeredzerotrust",
+        "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-12"
+        "date": "2026-04-27"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-intel-4.21-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "intel",
-        "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-12"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-intel-4.18-stable-badge.json",
+        "key": "mcgitops-aws-4.18-stable-badge.json",
         "pattern": "mcgitops",
-        "platform": "intel",
+        "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-11"
+        "date": "2026-02-23"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-intel-4.20-stable-badge.json",
+        "key": "mcgitops-aws-4.20-stable-badge.json",
         "pattern": "mcgitops",
-        "platform": "intel",
+        "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-11"
+        "date": "2026-04-20"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-intel-4.21-stable-badge.json",
+        "key": "mcgitops-aws-4.21-stable-badge.json",
         "pattern": "mcgitops",
-        "platform": "intel",
+        "platform": "aws",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-11"
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopsstandalone-aws-4.21-stable-badge.json",
-        "pattern": "mcgitopsstandalone",
-        "platform": "aws",
+        "key": "mcgitops-azr-4.18-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "azr",
         "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-11"
+        "version": "4.18",
+        "date": "2026-04-27"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-aws-4.21-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "aws",
+        "key": "mcgitops-gcp-4.21-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "gcp",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-11"
+        "date": "2026-04-01"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "patternsoperator-aws-4.18-stable-badge.json",
-        "pattern": "patternsoperator",
-        "platform": "aws",
+        "key": "mcgitops-intel-4.18-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "intel",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-11"
+        "date": "2026-04-25"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "travelops-aws-4.21-stable-badge.json",
-        "pattern": "travelops",
-        "platform": "aws",
+        "key": "mcgitops-intel-4.20-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "intel",
         "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-11"
+        "version": "4.20",
+        "date": "2026-04-25"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "coco-azr-4.21-stable-badge.json",
-        "pattern": "coco",
-        "platform": "azr",
+        "key": "mcgitops-intel-4.21-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "intel",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-04-10"
+        "date": "2026-04-25"
     },
     {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopshcp-aws-4.21-stable-badge.json",
-        "pattern": "mcgitopshcp",
-        "platform": "aws",
+        "base": "https://vp-ntnx-results.s3.amazonaws.com",
+        "key": "mcgitops-nutanix-4.12-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "nutanix",
         "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-10"
+        "version": "4.12",
+        "date": "2024-04-03"
     },
     {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-aws-4.18-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "aws",
+        "base": "https://vp-ntnx-results.s3.amazonaws.com",
+        "key": "mcgitops-nutanix-4.13-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "nutanix",
         "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-10"
+        "version": "4.13",
+        "date": "2024-04-03"
     },
     {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "hypershift-aws-4.18-stable-badge.json",
-        "pattern": "hypershift",
-        "platform": "aws",
+        "base": "https://vp-ntnx-results.s3.amazonaws.com",
+        "key": "mcgitops-nutanix-4.14-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "nutanix",
         "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-09"
+        "version": "4.14",
+        "date": "2024-04-03"
+    },
+    {
+        "base": "https://vp-ntnx-results.s3.amazonaws.com",
+        "key": "mcgitops-nutanix-4.15-stable-badge.json",
+        "pattern": "mcgitops",
+        "platform": "nutanix",
+        "operator": "N/A",
+        "version": "4.15",
+        "date": "2024-04-03"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "travelops-aws-4.18-stable-badge.json",
-        "pattern": "travelops",
+        "key": "mcgitopshcp-aws-4.18-stable-badge.json",
+        "pattern": "mcgitopshcp",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-09"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "travelops-aws-4.20-stable-badge.json",
-        "pattern": "travelops",
+        "key": "mcgitopshcp-aws-4.20-stable-badge.json",
+        "pattern": "mcgitopshcp",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-09"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "industrialedge-azr-4.20-stable-badge.json",
-        "pattern": "industrialedge",
-        "platform": "azr",
+        "key": "mcgitopshcp-aws-4.21-stable-badge.json",
+        "pattern": "mcgitopshcp",
+        "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-08"
+        "version": "4.21",
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "ragllm-aws-4.18-stable-badge.json",
-        "pattern": "ragllm",
+        "key": "mcgitopsstandalone-aws-4.18-stable-badge.json",
+        "pattern": "mcgitopsstandalone",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-08"
+        "date": "2026-04-05"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "aegitops-aws-4.20-stable-badge.json",
-        "pattern": "aegitops",
+        "key": "mcgitopsstandalone-aws-4.20-stable-badge.json",
+        "pattern": "mcgitopsstandalone",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-07"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopsstandalone-aws-4.20-stable-badge.json",
+        "key": "mcgitopsstandalone-aws-4.21-stable-badge.json",
         "pattern": "mcgitopsstandalone",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-07"
+        "version": "4.21",
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "coco-azr-4.18-stable-badge.json",
-        "pattern": "coco",
-        "platform": "azr",
+        "key": "mcgitopsstandalone-gcp-4.18-stable-badge.json",
+        "pattern": "mcgitopsstandalone",
+        "platform": "gcp",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-06"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "coco-azr-4.20-stable-badge.json",
-        "pattern": "coco",
-        "platform": "azr",
+        "key": "medicaldiag-aws-4.18-stable-badge.json",
+        "pattern": "medicaldiag",
+        "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-06"
+        "version": "4.18",
+        "date": "2026-04-27"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "layeredzerotrust-aws-4.20-stable-badge.json",
-        "pattern": "layeredzerotrust",
+        "key": "medicaldiag-aws-4.20-stable-badge.json",
+        "pattern": "medicaldiag",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-06"
+        "date": "2026-02-16"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-aws-4.20-stable-badge.json",
-        "pattern": "mcgitops",
+        "key": "medicaldiag-aws-4.21-stable-badge.json",
+        "pattern": "medicaldiag",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-06"
+        "version": "4.21",
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-azr-4.18-stable-badge.json",
-        "pattern": "mcgitops",
+        "key": "medicaldiag-azr-4.20-stable-badge.json",
+        "pattern": "medicaldiag",
         "platform": "azr",
         "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-06"
+        "version": "4.20",
+        "date": "2026-04-27"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopshcp-aws-4.18-stable-badge.json",
-        "pattern": "mcgitopshcp",
+        "key": "openshiftai-aws-4.18-stable-badge.json",
+        "pattern": "openshiftai",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-06"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopsstandalone-gcp-4.18-stable-badge.json",
-        "pattern": "mcgitopsstandalone",
-        "platform": "gcp",
-        "operator": "N/A",
-        "version": "4.18",
-        "date": "2026-04-06"
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
@@ -357,249 +348,141 @@
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-04-06"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "patternsoperator-aws-4.20-stable-badge.json",
-        "pattern": "patternsoperator",
+        "key": "openshiftai-aws-4.21-stable-badge.json",
+        "pattern": "openshiftai",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.20",
-        "date": "2026-04-06"
+        "version": "4.21",
+        "date": "2026-04-24"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopsstandalone-aws-4.18-stable-badge.json",
-        "pattern": "mcgitopsstandalone",
-        "platform": "aws",
+        "key": "openshiftai-intel-4.18-stable-badge.json",
+        "pattern": "openshiftai",
+        "platform": "intel",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-04-05"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-gcp-4.21-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "gcp",
-        "operator": "N/A",
-        "version": "4.21",
-        "date": "2026-04-01"
+        "date": "2026-04-26"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "agof-aws-none-stable-badge.json",
-        "pattern": "agof",
-        "platform": "aws",
+        "key": "openshiftai-intel-4.20-stable-badge.json",
+        "pattern": "openshiftai",
+        "platform": "intel",
         "operator": "N/A",
-        "version": "none",
-        "date": "2026-03-06"
+        "version": "4.20",
+        "date": "2026-04-26"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "industrialedge-aws-4.21-stable-badge.json",
-        "pattern": "industrialedge",
-        "platform": "aws",
+        "key": "openshiftai-intel-4.21-stable-badge.json",
+        "pattern": "openshiftai",
+        "platform": "intel",
         "operator": "N/A",
         "version": "4.21",
-        "date": "2026-02-27"
+        "date": "2026-04-26"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-aws-4.18-stable-badge.json",
-        "pattern": "mcgitops",
+        "key": "patternsoperator-aws-4.18-stable-badge.json",
+        "pattern": "patternsoperator",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.18",
-        "date": "2026-02-23"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "aegitops-aws-4.19-stable-badge.json",
-        "pattern": "aegitops",
-        "platform": "aws",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-17"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-aws-4.19-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "aws",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-16"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopshcp-aws-4.19-stable-badge.json",
-        "pattern": "mcgitopshcp",
-        "platform": "aws",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-16"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "medicaldiag-aws-4.20-stable-badge.json",
-        "pattern": "medicaldiag",
+        "key": "patternsoperator-aws-4.20-stable-badge.json",
+        "pattern": "patternsoperator",
         "platform": "aws",
         "operator": "N/A",
         "version": "4.20",
-        "date": "2026-02-16"
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "hypershift-aws-4.19-stable-badge.json",
-        "pattern": "hypershift",
+        "key": "ragllm-aws-4.18-stable-badge.json",
+        "pattern": "ragllm",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-13"
+        "version": "4.18",
+        "date": "2026-04-29"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "ragllm-aws-4.19-stable-badge.json",
+        "key": "ragllm-aws-4.21-stable-badge.json",
         "pattern": "ragllm",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-13"
+        "version": "4.21",
+        "date": "2026-04-15"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "medicaldiag-azr-4.19-stable-badge.json",
-        "pattern": "medicaldiag",
+        "key": "ragllm-azr-4.20-stable-badge.json",
+        "pattern": "ragllm",
         "platform": "azr",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-09"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-intel-4.19-stable-badge.json",
-        "pattern": "openshiftai",
-        "platform": "intel",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-08"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-intel-4.19-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "intel",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-07"
+        "version": "4.20",
+        "date": "2026-04-15"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitopsstandalone-aws-4.19-stable-badge.json",
-        "pattern": "mcgitopsstandalone",
+        "key": "retail-aws-4.18-stable-badge.json",
+        "pattern": "retail",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-06"
+        "version": "4.18",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "openshiftai-aws-4.19-stable-badge.json",
-        "pattern": "openshiftai",
+        "key": "retail-aws-4.20-stable-badge.json",
+        "pattern": "retail",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-06"
+        "version": "4.20",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "travelops-aws-4.19-stable-badge.json",
-        "pattern": "travelops",
+        "key": "retail-aws-4.21-stable-badge.json",
+        "pattern": "retail",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-05"
+        "version": "4.21",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "industrialedge-aws-4.19-stable-badge.json",
-        "pattern": "industrialedge",
+        "key": "travelops-aws-4.18-stable-badge.json",
+        "pattern": "travelops",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-04"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "coco-azr-4.19-stable-badge.json",
-        "pattern": "coco",
-        "platform": "azr",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-03"
+        "version": "4.18",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "patternsoperator-aws-4.19-stable-badge.json",
-        "pattern": "patternsoperator",
+        "key": "travelops-aws-4.20-stable-badge.json",
+        "pattern": "travelops",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-03"
-    },
-    {
-        "base": "https://storage.googleapis.com/vp-results",
-        "key": "mcgitops-gcp-4.19-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "gcp",
-        "operator": "N/A",
-        "version": "4.19",
-        "date": "2026-02-01"
+        "version": "4.20",
+        "date": "2026-04-17"
     },
     {
         "base": "https://storage.googleapis.com/vp-results",
-        "key": "layeredzerotrust-aws-4.19-stable-badge.json",
-        "pattern": "layeredzerotrust",
+        "key": "travelops-aws-4.21-stable-badge.json",
+        "pattern": "travelops",
         "platform": "aws",
         "operator": "N/A",
-        "version": "4.19",
-        "date": "2025-12-22"
-    },
-    {
-        "base": "https://vp-ntnx-results.s3.amazonaws.com",
-        "key": "mcgitops-nutanix-4.12-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "nutanix",
-        "operator": "N/A",
-        "version": "4.12",
-        "date": "2024-04-03"
-    },
-    {
-        "base": "https://vp-ntnx-results.s3.amazonaws.com",
-        "key": "mcgitops-nutanix-4.13-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "nutanix",
-        "operator": "N/A",
-        "version": "4.13",
-        "date": "2024-04-03"
-    },
-    {
-        "base": "https://vp-ntnx-results.s3.amazonaws.com",
-        "key": "mcgitops-nutanix-4.14-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "nutanix",
-        "operator": "N/A",
-        "version": "4.14",
-        "date": "2024-04-03"
-    },
-    {
-        "base": "https://vp-ntnx-results.s3.amazonaws.com",
-        "key": "mcgitops-nutanix-4.15-stable-badge.json",
-        "pattern": "mcgitops",
-        "platform": "nutanix",
-        "operator": "N/A",
-        "version": "4.15",
-        "date": "2024-04-03"
+        "version": "4.21",
+        "date": "2026-04-24"
     }
-]
\ No newline at end of file
+]
diff --git a/static/js/dashboard.v2.js b/static/js/dashboard.v2.js
index 32ae1710fd..b842be3650 100644
--- a/static/js/dashboard.v2.js
+++ b/static/js/dashboard.v2.js
@@ -44,6 +44,18 @@ function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
+// Still present in badge buckets but no longer in the CI matrix (omit from dashboard)
+var CI_DASHBOARD_EXCLUDED_OCP_VERSIONS = ['4.19']
+
+function excludeRetiredOcpVersionsFromDashboard (badges) {
+  if (!badges || badges.length === 0) {
+    return badges || []
+  }
+  return badges.filter(function (b) {
+    return CI_DASHBOARD_EXCLUDED_OCP_VERSIONS.indexOf(b.version) === -1
+  })
+}
+
 function filterBadges (badges, field, value) {
   if (field === 'pattern') {
     return badges.filter(badge => badge.pattern === value)
@@ -1094,6 +1106,7 @@ function getBadges (xmlText, bucket_url, badge_set) {
 }
 
 function processBadges (badges, options) {
+  badges = excludeRetiredOcpVersionsFromDashboard(badges)
   if (options.get('disable_buttons') === true) {
     processBadgesLegacy(badges, options)
     return