diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml
index 77aa8774ee2a..233e23dc068f 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml
@@ -50,15 +50,13 @@ prow_ignored:
         to: "1.30"
       - from: "1.30"
         to: "1.31"
-    release-1.7:
-      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.29"
+    release-1.8:
+      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30"
       interval: "4h"
       upgradesInterval: "24h"
-      kubernetesVersionManagement: "v1.26.15"
-      kubebuilderEnvtestKubernetesVersion: "1.26.1"
+      kubernetesVersionManagement: "v1.27.13"
+      kubebuilderEnvtestKubernetesVersion: "1.27.1"
       upgrades:
-      - from: "1.24"
-        to: "1.25"
       - from: "1.25"
         to: "1.26"
       - from: "1.26"
@@ -69,15 +67,15 @@ prow_ignored:
         to: "1.29"
       - from: "1.29"
         to: "1.30"
-    release-1.6:
-      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.28"
+      - from: "1.30"
+        to: "1.31"
+    release-1.7:
+      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.29"
       interval: "4h"
       upgradesInterval: "24h"
-      kubernetesVersionManagement: "v1.25.11"
-      kubebuilderEnvtestKubernetesVersion: "1.25.0"
+      kubernetesVersionManagement: "v1.26.15"
+      kubebuilderEnvtestKubernetesVersion: "1.26.1"
       upgrades:
-      - from: "1.23"
-        to: "1.24"
       - from: "1.24"
         to: "1.25"
       - from: "1.25"
@@ -88,15 +86,15 @@ prow_ignored:
         to: "1.28"
       - from: "1.28"
         to: "1.29"
-    release-1.5:
-      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27"
+      - from: "1.29"
+        to: "1.30"
+    release-1.6:
+      testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.28"
       interval: "4h"
       upgradesInterval: "24h"
-      kubernetesVersionManagement: "v1.24.15"
-      kubebuilderEnvtestKubernetesVersion: "1.24.2"
+      kubernetesVersionManagement: "v1.25.11"
+      kubebuilderEnvtestKubernetesVersion: "1.25.0"
       upgrades:
-      - from: "1.22"
-        to: "1.23"
       - from: "1.23"
         to: "1.24"
       - from: "1.24"
@@ -107,6 +105,8 @@ prow_ignored:
         to: "1.27"
       - from: "1.27"
         to: "1.28"
+      - from: "1.28"
+        to: "1.29"
 
   # The generator will run each template per branch and use a filename friendly
   # branch variable to format the target filename.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics-upgrades.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics-upgrades.yaml
similarity index 83%
rename from config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics-upgrades.yaml
rename to config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics-upgrades.yaml
index 50bc2d404594..cd9567953f63 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics-upgrades.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics-upgrades.yaml
@@ -1,6 +1,6 @@
 # Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
 periodics:
-- name: periodic-cluster-api-e2e-upgrade-1-22-1-23-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-25-1-26-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -16,7 +16,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -24,7 +24,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -32,13 +32,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.22"
+        value: "stable-1.25"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.23"
+        value: "stable-1.26"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.3-0"
+        value: "3.5.6-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.8.6"
+        value: "v1.9.3"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -52,12 +52,12 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-22-1-23
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-25-1-26
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-23-1-24-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -73,7 +73,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -81,7 +81,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -89,13 +89,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.23"
+        value: "stable-1.26"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.24"
+        value: "stable-1.27"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.3-0"
+        value: "3.5.6-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.8.6"
+        value: "v1.9.3"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -109,12 +109,12 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-23-1-24
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-26-1-27
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-24-1-25-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -130,7 +130,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -138,7 +138,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -146,13 +146,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.24"
+        value: "stable-1.27"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.25"
+        value: "stable-1.28"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.4-0"
+        value: "3.5.9-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.9.3"
+        value: "v1.10.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -166,12 +166,12 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-24-1-25
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-27-1-28
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-25-1-26-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -187,7 +187,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -195,7 +195,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -203,13 +203,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.25"
+        value: "stable-1.28"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.26"
+        value: "stable-1.29"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.6-0"
+        value: "3.5.10-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.9.3"
+        value: "v1.11.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -223,12 +223,12 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-25-1-26
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-28-1-29
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -244,7 +244,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -252,7 +252,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -260,13 +260,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.26"
+        value: "stable-1.29"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.27"
+        value: "stable-1.30"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.6-0"
+        value: "3.5.12-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.9.3"
+        value: "v1.11.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -280,12 +280,12 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-26-1-27
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-29-1-30
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 
-- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-release-1-5
+- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-release-1-8
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -301,7 +301,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -309,7 +309,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -317,13 +317,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "stable-1.27"
+        value: "stable-1.30"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "stable-1.28"
+        value: "ci/latest-1.31"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "3.5.9-0"
+        value: "3.5.12-0"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "v1.10.1"
+        value: "v1.11.1"
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -337,7 +337,7 @@ periodics:
           cpu: 6000m
           memory: 6Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5-1-27-1-28
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8-1-30-1-31
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
similarity index 59%
rename from config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics.yaml
rename to config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
index 7b988bee512c..7db4050ef233 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-periodics.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
@@ -1,6 +1,6 @@
 # Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
 periodics:
-- name: periodic-cluster-api-test-release-1-5
+- name: periodic-cluster-api-test-release-1-8
   cluster: eks-prow-build-cluster
   interval: 4h
   decorate: true
@@ -13,11 +13,11 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       command:
       - runner.sh
       - ./scripts/ci-test.sh
@@ -29,11 +29,11 @@ periodics:
           cpu: 7300m
           memory: 8Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-test-release-1-5
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-test-release-1-8
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-- name: periodic-cluster-api-test-mink8s-release-1-5
+- name: periodic-cluster-api-test-mink8s-release-1-8
   cluster: eks-prow-build-cluster
   interval: 4h
   decorate: true
@@ -46,11 +46,11 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       command:
       - runner.sh
       - ./scripts/ci-test.sh
@@ -63,7 +63,7 @@ periodics:
       # To check the latest available envtest in Kubebuilder for the minor version we determined above, please
       # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
       - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
-        value: "1.24.2"
+        value: "1.27.1"
       resources:
         requests:
           cpu: 7300m
@@ -72,11 +72,11 @@ periodics:
           cpu: 7300m
           memory: 8Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-test-mink8s-release-1-5
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-test-mink8s-release-1-8
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-- name: periodic-cluster-api-e2e-release-1-5
+- name: periodic-cluster-api-e2e-release-1-8
   cluster: eks-prow-build-cluster
   interval: 4h
   decorate: true
@@ -92,7 +92,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -100,7 +100,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -121,11 +121,11 @@ periodics:
             cpu: 3000m
             memory: 8Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-release-1-5
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-release-1-8
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-- name: periodic-cluster-api-e2e-mink8s-release-1-5
+- name: periodic-cluster-api-e2e-mink8s-release-1-8
   cluster: eks-prow-build-cluster
   interval: 4h
   decorate: true
@@ -141,7 +141,7 @@ periodics:
   extra_refs:
   - org: kubernetes-sigs
     repo: cluster-api
-    base_ref: release-1.5
+    base_ref: release-1.8
     path_alias: sigs.k8s.io/cluster-api
   - org: kubernetes
     repo: kubernetes
@@ -149,7 +149,7 @@ periodics:
     path_alias: k8s.io/kubernetes
   spec:
     containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
       args:
       - runner.sh
       - "./scripts/ci-e2e.sh"
@@ -166,7 +166,7 @@ periodics:
       # Please also make sure to refer a version where a kindest/node image exists
       # for (see https://github.com/kubernetes-sigs/kind/releases/)
       - name: KUBERNETES_VERSION_MANAGEMENT
-        value: "v1.24.15"
+        value: "v1.27.13"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -178,7 +178,100 @@ periodics:
           cpu: 3000m
           memory: 8Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-    testgrid-tab-name: capi-e2e-mink8s-release-1-5
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-mink8s-release-1-8
+    testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
+    testgrid-num-failures-to-alert: "4"
+
+- name: periodic-cluster-api-e2e-conformance-release-1-8
+  cluster: eks-prow-build-cluster
+  interval: 4h
+  decorate: true
+  decoration_config:
+    timeout: 120m
+  rerun_auth_config:
+    github_team_slugs:
+    - org: kubernetes-sigs
+      slug: cluster-api-maintainers
+  labels:
+    preset-dind-enabled: "true"
+    preset-kind-volume-mounts: "true"
+  extra_refs:
+  - org: kubernetes-sigs
+    repo: cluster-api
+    base_ref: release-1.8
+    path_alias: sigs.k8s.io/cluster-api
+  - org: kubernetes
+    repo: kubernetes
+    base_ref: master
+    path_alias: k8s.io/kubernetes
+  spec:
+    containers:
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
+      args:
+      - runner.sh
+      - "./scripts/ci-e2e.sh"
+      env:
+      - name: GINKGO_FOCUS
+        value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # we need privileged mode in order to do docker in docker
+      securityContext:
+        privileged: true
+      resources:
+        requests:
+          cpu: 4000m
+          memory: 4Gi
+        limits:
+          cpu: 4000m
+          memory: 4Gi
+  annotations:
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-conformance-release-1-8
+    testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
+    testgrid-num-failures-to-alert: "4"
+- name: periodic-cluster-api-e2e-conformance-ci-latest-release-1-8
+  cluster: eks-prow-build-cluster
+  interval: 4h
+  decorate: true
+  decoration_config:
+    timeout: 120m
+  rerun_auth_config:
+    github_team_slugs:
+    - org: kubernetes-sigs
+      slug: cluster-api-maintainers
+  labels:
+    preset-dind-enabled: "true"
+    preset-kind-volume-mounts: "true"
+  extra_refs:
+  - org: kubernetes-sigs
+    repo: cluster-api
+    base_ref: release-1.8
+    path_alias: sigs.k8s.io/cluster-api
+  - org: kubernetes
+    repo: kubernetes
+    base_ref: master
+    path_alias: k8s.io/kubernetes
+  spec:
+    containers:
+    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
+      args:
+      - runner.sh
+      - "./scripts/ci-e2e.sh"
+      env:
+      - name: GINKGO_FOCUS
+        value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # we need privileged mode in order to do docker in docker
+      securityContext:
+        privileged: true
+      resources:
+        requests:
+          cpu: 4000m
+          memory: 4Gi
+        limits:
+          cpu: 4000m
+          memory: 4Gi
+  annotations:
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+    testgrid-tab-name: capi-e2e-conformance-ci-latest-release-1-8
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
similarity index 72%
rename from config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-presubmits.yaml
rename to config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
index ee1d9d5759f9..97ffb0f0171c 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-5-presubmits.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
@@ -1,7 +1,7 @@
 # Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
 presubmits:
   kubernetes-sigs/cluster-api:
-  - name: pull-cluster-api-build-release-1-5
+  - name: pull-cluster-api-build-release-1-8
     cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
@@ -10,10 +10,10 @@ presubmits:
     always_run: true
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         command:
         - runner.sh
         - ./scripts/ci-build.sh
@@ -25,9 +25,9 @@ presubmits:
             cpu: 6000m
             memory: 4Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-build-release-1-5
-  - name: pull-cluster-api-apidiff-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-build-release-1-8
+  - name: pull-cluster-api-apidiff-release-1-8
     cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
@@ -36,14 +36,14 @@ presubmits:
     optional: true
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
       - command:
         - runner.sh
         - ./scripts/ci-apidiff.sh
-        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+        image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         resources:
           requests:
             cpu: 6000m
@@ -52,9 +52,9 @@ presubmits:
             cpu: 6000m
             memory: 2Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-apidiff-release-1-5
-  - name: pull-cluster-api-verify-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-apidiff-release-1-8
+  - name: pull-cluster-api-verify-release-1-8
     cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
@@ -65,10 +65,10 @@ presubmits:
       preset-dind-enabled: "true"
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         command:
         - "runner.sh"
         - ./scripts/ci-verify.sh
@@ -82,9 +82,9 @@ presubmits:
         securityContext:
           privileged: true
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-verify-release-1-5
-  - name: pull-cluster-api-test-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-verify-release-1-8
+  - name: pull-cluster-api-test-release-1-8
     cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
@@ -92,11 +92,11 @@ presubmits:
     path_alias: sigs.k8s.io/cluster-api
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
         - runner.sh
         - ./scripts/ci-test.sh
@@ -108,9 +108,9 @@ presubmits:
             cpu: 7300m
             memory: 8Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-test-release-1-5
-  - name: pull-cluster-api-test-mink8s-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-test-release-1-8
+  - name: pull-cluster-api-test-mink8s-release-1-8
     cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
@@ -119,10 +119,10 @@ presubmits:
     always_run: false
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
         - runner.sh
         - ./scripts/ci-test.sh
@@ -135,7 +135,7 @@ presubmits:
         # To check the latest available envtest in Kubebuilder for the minor version we determined above, please
         # refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
         - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
-          value: "1.24.2"
+          value: "1.27.1"
         resources:
           requests:
             cpu: 7300m
@@ -144,9 +144,9 @@ presubmits:
             cpu: 7300m
             memory: 8Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-test-mink8s-release-1-5
-  - name: pull-cluster-api-e2e-mink8s-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-test-mink8s-release-1-8
+  - name: pull-cluster-api-e2e-mink8s-release-1-8
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -163,10 +163,10 @@ presubmits:
     always_run: false
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
         - runner.sh
         - ./scripts/ci-e2e.sh
@@ -183,7 +183,7 @@ presubmits:
         # Please also make sure to refer a version where a kindest/node image exists
         # for (see https://github.com/kubernetes-sigs/kind/releases/)
         - name: KUBERNETES_VERSION_MANAGEMENT
-          value: "v1.24.15"
+          value: "v1.27.13"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -195,9 +195,9 @@ presubmits:
             cpu: 3000m
             memory: 8Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-e2e-mink8s-release-1-5
-  - name: pull-cluster-api-e2e-blocking-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-mink8s-release-1-8
+  - name: pull-cluster-api-e2e-blocking-release-1-8
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -212,12 +212,12 @@ presubmits:
       timeout: 120m
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     path_alias: sigs.k8s.io/cluster-api
     run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
@@ -235,9 +235,9 @@ presubmits:
             cpu: 3000m
             memory: 8Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-e2e-blocking-release-1-5
-  - name: pull-cluster-api-e2e-informing-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-blocking-release-1-8
+  - name: pull-cluster-api-e2e-release-1-8
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -250,21 +250,23 @@ presubmits:
     decorate: true
     decoration_config:
       timeout: 120m
-    optional: true
+    always_run: false
     branches:
-      # The script this job runs is not in all branches.
-      - ^release-1.5$
+    # The script this job runs is not in all branches.
+    - ^release-1.8$
     path_alias: sigs.k8s.io/cluster-api
-    run_if_changed: '^((api|bootstrap|cmd|config|controllers|controlplane|errors|exp|feature|hack|internal|scripts|test|util|webhooks|version)/|main\.go|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
-        - runner.sh
-        - "./scripts/ci-e2e.sh"
+          - runner.sh
+          - "./scripts/ci-e2e.sh"
         env:
-        - name: GINKGO_FOCUS
-          value: "\\[PR-Informing\\]"
+          # enable IPV6 in bootstrap image
+          - name: "DOCKER_IN_DOCKER_IPV6_ENABLED"
+            value: "true"
+          - name: GINKGO_SKIP
+            value: "\\[Conformance\\]"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -276,98 +278,136 @@ presubmits:
             cpu: 3000m
             memory: 8Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-e2e-informing-release-1-5
-  - name: pull-cluster-api-e2e-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-release-1-8
+  - name: pull-cluster-api-e2e-upgrade-1-30-1-31-release-1-8
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    extra_refs:
-    - org: kubernetes
-      repo: kubernetes
-      base_ref: master
-      path_alias: k8s.io/kubernetes
     decorate: true
     decoration_config:
       timeout: 120m
     always_run: false
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     path_alias: sigs.k8s.io/cluster-api
+    extra_refs:
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: master
+      path_alias: k8s.io/kubernetes
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
           - runner.sh
           - "./scripts/ci-e2e.sh"
         env:
-          # enable IPV6 in bootstrap image
-          - name: "DOCKER_IN_DOCKER_IPV6_ENABLED"
+          - name: ALWAYS_BUILD_KIND_IMAGES
             value: "true"
-          - name: GINKGO_SKIP
-            value: "\\[Conformance\\]"
+          - name: KUBERNETES_VERSION_UPGRADE_FROM
+            value: "stable-1.30"
+          - name: KUBERNETES_VERSION_UPGRADE_TO
+            value: "ci/latest-1.31"
+          - name: ETCD_VERSION_UPGRADE_TO
+            value: "3.5.12-0"
+          - name: COREDNS_VERSION_UPGRADE_TO
+            value: "v1.11.1"
+          - name: GINKGO_FOCUS
+            value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
         resources:
           requests:
-            cpu: 3000m
-            memory: 8Gi
+            cpu: 6000m
+            memory: 6Gi
           limits:
-            cpu: 3000m
-            memory: 8Gi
+            cpu: 6000m
+            memory: 6Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-e2e-release-1-5
-  - name: pull-cluster-api-e2e-upgrade-1-27-1-28-release-1-5
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-release-1-8-1-30-1-31
+
+  - name: pull-cluster-api-e2e-conformance-release-1-8
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
+    extra_refs:
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: master
+      path_alias: k8s.io/kubernetes
     decorate: true
     decoration_config:
       timeout: 120m
     always_run: false
     branches:
     # The script this job runs is not in all branches.
-    - ^release-1.5$
+    - ^release-1.8$
     path_alias: sigs.k8s.io/cluster-api
+    spec:
+      containers:
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
+        args:
+        - runner.sh
+        - "./scripts/ci-e2e.sh"
+        env:
+        - name: GINKGO_FOCUS
+          value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # we need privileged mode in order to do docker in docker
+        securityContext:
+          privileged: true
+        resources:
+          requests:
+            cpu: 4000m
+            memory: 4Gi
+          limits:
+            cpu: 4000m
+            memory: 4Gi
+    annotations:
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-conformance-release-1-8
+  - name: pull-cluster-api-e2e-conformance-ci-latest-release-1-8
+    cluster: eks-prow-build-cluster
+    labels:
+      preset-dind-enabled: "true"
+      preset-kind-volume-mounts: "true"
     extra_refs:
     - org: kubernetes
       repo: kubernetes
       base_ref: master
       path_alias: k8s.io/kubernetes
+    decorate: true
+    decoration_config:
+      timeout: 120m
+    always_run: false
+    branches:
+    # The script this job runs is not in all branches.
+    - ^release-1.8$
+    path_alias: sigs.k8s.io/cluster-api
     spec:
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.27
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-1.30
         args:
-          - runner.sh
-          - "./scripts/ci-e2e.sh"
+        - runner.sh
+        - "./scripts/ci-e2e.sh"
         env:
-          - name: ALWAYS_BUILD_KIND_IMAGES
-            value: "true"
-          - name: KUBERNETES_VERSION_UPGRADE_FROM
-            value: "stable-1.27"
-          - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "stable-1.28"
-          - name: ETCD_VERSION_UPGRADE_TO
-            value: "3.5.9-0"
-          - name: COREDNS_VERSION_UPGRADE_TO
-            value: "v1.10.1"
-          - name: GINKGO_FOCUS
-            value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
+        - name: GINKGO_FOCUS
+          value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
         resources:
           requests:
-            cpu: 6000m
-            memory: 6Gi
+            cpu: 4000m
+            memory: 4Gi
           limits:
-            cpu: 6000m
-            memory: 6Gi
+            cpu: 4000m
+            memory: 4Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.5
-      testgrid-tab-name: capi-pr-e2e-release-1-5-1-27-1-28
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.8
+      testgrid-tab-name: capi-pr-e2e-conformance-ci-latest-release-1-8
diff --git a/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml b/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml
index f03d2ae4fb53..bf19bb945008 100644
--- a/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml
+++ b/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml
@@ -5,9 +5,9 @@ dashboard_groups:
     - sig-cluster-lifecycle-kubeadm
     - sig-cluster-lifecycle-cluster-addons
     - sig-cluster-lifecycle-cluster-api
-    - sig-cluster-lifecycle-cluster-api-1.5
     - sig-cluster-lifecycle-cluster-api-1.6
     - sig-cluster-lifecycle-cluster-api-1.7
+    - sig-cluster-lifecycle-cluster-api-1.8
     - sig-cluster-lifecycle-cluster-api-addon-provider-helm
     - sig-cluster-lifecycle-cluster-api-provider-aws
     - sig-cluster-lifecycle-cluster-api-provider-aws-2.0
@@ -33,9 +33,9 @@ dashboards:
 - name: sig-cluster-lifecycle-kubeadm
 - name: sig-cluster-lifecycle-cluster-addons
 - name: sig-cluster-lifecycle-cluster-api
-- name: sig-cluster-lifecycle-cluster-api-1.5
 - name: sig-cluster-lifecycle-cluster-api-1.6
 - name: sig-cluster-lifecycle-cluster-api-1.7
+- name: sig-cluster-lifecycle-cluster-api-1.8
 - name: sig-cluster-lifecycle-cluster-api-addon-provider-helm
 - name: sig-cluster-lifecycle-cluster-api-provider-aws-2.0
 - name: sig-cluster-lifecycle-cluster-api-provider-aws