diff --git a/.github/ISSUE_TEMPLATE/release_tracking.md b/.github/ISSUE_TEMPLATE/release_tracking.md
index c01f37ed9c..7ea79c7e56 100644
--- a/.github/ISSUE_TEMPLATE/release_tracking.md
+++ b/.github/ISSUE_TEMPLATE/release_tracking.md
@@ -15,6 +15,9 @@ Early in the cycle:
 * [ ] [Prepare main branch for development of the new release](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#prepare-main-branch-for-development-of-the-new-release)
 * [ ] [Remove previously deprecated code](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/main/docs/release/release-tasks.md#remove-previously-deprecated-code)
 
+Release-specific tasks:
+
+
 After the Kubernetes minor release:
 * [ ] Bump the Kubernetes version 
   * [ ] Publish new OVA images
diff --git a/test/e2e/config/config-overrides-example.yaml b/test/e2e/config/config-overrides-example.yaml
index 0acbd3c930..815c9a44f7 100644
--- a/test/e2e/config/config-overrides-example.yaml
+++ b/test/e2e/config/config-overrides-example.yaml
@@ -14,7 +14,7 @@ variables:
   VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
   VSPHERE_NETWORK: "network-1"
   VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0"
-  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.32.0"
+  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0"
   CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
   # Only for clusterctl upgrade tests
   # WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml
index b81dc38376..de70e4cef3 100644
--- a/test/e2e/config/vsphere.yaml
+++ b/test/e2e/config/vsphere.yaml
@@ -26,8 +26,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: "v1.9.1"
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.1/core-components.yaml"
+      - name: "{go://sigs.k8s.io/cluster-api@v1.9}"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -66,8 +66,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: "v1.9.1"
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.1/bootstrap-components.yaml"
+      - name: "{go://sigs.k8s.io/cluster-api@v1.9}"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
@@ -106,8 +106,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: "v1.9.1"
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.1/control-plane-components.yaml"
+      - name: "{go://sigs.k8s.io/cluster-api@v1.9}"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.9}/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files: