diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
index 4b4eab8d6c84..3b5cf2f9f541 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-main
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-
 - name: periodic-cluster-api-e2e-conformance-main
   cluster: eks-prow-build-cluster
   interval: 3h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml
index 54fe6556ef9d..94e59ca08907 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api
       testgrid-tab-name: capi-pr-e2e-main-1-32-1-33
-
   - name: pull-cluster-api-e2e-conformance-main
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml
index f3dfe238bcad..75e44b34a921 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-release-1-7
     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-7
   cluster: eks-prow-build-cluster
   interval: 4h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml
index a51ddd3ded62..74f795707eaa 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-7-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.7
       testgrid-tab-name: capi-pr-e2e-release-1-7-1-29-1-30
-
   - name: pull-cluster-api-e2e-conformance-release-1-7
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
index 2c7bee9d8ace..170e63ec4492 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     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
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
index 15ba0af37523..21c5e5984940 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-8-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       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:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml
index 689dd01a5610..7c96b70a2b0e 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-periodics.yaml
@@ -110,6 +110,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -159,6 +162,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -182,7 +188,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-release-1-9
     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-9
   cluster: eks-prow-build-cluster
   interval: 4h
@@ -214,6 +219,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -260,6 +268,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-presubmits.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-presubmits.yaml
index 824560578589..45cb0003b7f8 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-presubmits.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-9-presubmits.yaml
@@ -176,6 +176,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -224,6 +227,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -267,6 +273,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -330,7 +339,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
       testgrid-tab-name: capi-pr-e2e-release-1-9-1-31-1-32
-
   - name: pull-cluster-api-e2e-conformance-release-1-9
     cluster: eks-prow-build-cluster
     labels:
@@ -358,6 +366,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -398,6 +409,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
diff --git a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl
index b39ee261ffe9..5b1a570620fb 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl
+++ b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl
@@ -109,6 +109,9 @@ periodics:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -158,6 +161,9 @@ periodics:
         value: "true"
       - name: GINKGO_SKIP
         value: "\\[Conformance\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
       # This value determines the minimum Kubernetes
       # supported version for Cluster API management cluster
       # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -181,7 +187,6 @@ periodics:
     testgrid-tab-name: capi-e2e-mink8s-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-{{ if eq $.branch "release-1.5" "release-1.6" | not }}
 - name: periodic-cluster-api-e2e-conformance-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
@@ -213,6 +218,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -259,6 +267,9 @@ periodics:
       env:
       - name: GINKGO_FOCUS
         value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+      # Ensure required kind images get built.
+      - name: KIND_BUILD_IMAGES
+        value: "KUBERNETES_VERSION_LATEST_CI"
       # we need privileged mode in order to do docker in docker
       securityContext:
         privileged: true
@@ -274,7 +285,6 @@ periodics:
     testgrid-tab-name: capi-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-{{ end -}}
 {{ if eq $.branch "main" }}
 - name: periodic-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
diff --git a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl
index dab85d162762..ed7b4b7d8cd7 100644
--- a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl
+++ b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl
@@ -175,6 +175,9 @@ presubmits:
           value: "true"
         - name: GINKGO_SKIP
           value: "\\[Conformance\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # This value determines the minimum Kubernetes
         # supported version for Cluster API management cluster
         # and can be found by referring to [Supported Kubernetes Version](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions)
@@ -223,6 +226,9 @@ presubmits:
         env:
           - name: GINKGO_FOCUS
             value: "\\[PR-Blocking\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -236,49 +242,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
       testgrid-tab-name: capi-pr-e2e-blocking-{{ ReplaceAll $.branch "." "-" }}
-{{- if eq $.branch "release-1.5" }}
-  - name: pull-cluster-api-e2e-informing-{{ ReplaceAll $.branch "." "-" }}
-    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: 180m
-    optional: true
-    branches:
-      # The script this job runs is not in all branches.
-      - ^{{ $.branch }}$
-    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: {{ $.config.TestImage }}
-        args:
-        - runner.sh
-        - "./scripts/ci-e2e.sh"
-        env:
-        - name: GINKGO_FOCUS
-          value: "\\[PR-Informing\\]"
-        # we need privileged mode in order to do docker in docker
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: 3000m
-            memory: 8Gi
-          limits:
-            cpu: 3000m
-            memory: 8Gi
-    annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-informing-{{ ReplaceAll $.branch "." "-" }}
-{{- end }}
   - name: pull-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
@@ -309,6 +272,9 @@ presubmits:
             value: "true"
           - name: GINKGO_SKIP
             value: "\\[Conformance\\]"
+          # Ensure required kind images get built.
+          - name: KIND_BUILD_IMAGES
+            value: "KUBERNETES_VERSION,KUBERNETES_VERSION_LATEST_CI,KUBERNETES_VERSION_UPGRADE_TO,KUBERNETES_VERSION_UPGRADE_FROM"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -372,7 +338,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
       testgrid-tab-name: capi-pr-e2e-{{ ReplaceAll $.branch "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}
-{{ if eq $.branch "release-1.5" "release-1.6" | not }}
   - name: pull-cluster-api-e2e-conformance-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
@@ -400,6 +365,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -440,6 +408,9 @@ presubmits:
         env:
         - name: GINKGO_FOCUS
           value: "\\[Conformance\\] \\[K8s-Install-ci-latest\\]"
+        # Ensure required kind images get built.
+        - name: KIND_BUILD_IMAGES
+          value: "KUBERNETES_VERSION_LATEST_CI"
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
@@ -453,7 +424,6 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
       testgrid-tab-name: capi-pr-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
-{{ end -}}
 {{ if eq $.branch "main" }}
   - name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster