diff --git a/.github/ISSUE_TEMPLATE/kubernetes_bump.md b/.github/ISSUE_TEMPLATE/kubernetes_bump.md
index b5e1c53c687a..12ffe6062bff 100644
--- a/.github/ISSUE_TEMPLATE/kubernetes_bump.md
+++ b/.github/ISSUE_TEMPLATE/kubernetes_bump.md
@@ -92,6 +92,7 @@ run the Cluster API controllers on the new Kubernetes version.
   * Prior art: https://github.com/kubernetes-sigs/cluster-api/pull/10452
 * [ ] Bumps in Cluster API repo:
   * controller-runtime & controller-tools in go.mod files
+  * setup-envtest via `SETUP_ENVTEST_VER` in `Makefile`
   * controller-gen via `CONTROLLER_GEN_VER` in `Makefile`
   * conversion-gen via `CONVERSION_GEN_VER` in `Makefile`
   * Prior art: https://github.com/kubernetes-sigs/cluster-api/pull/10803
diff --git a/Makefile b/Makefile
index effb48440ed8..2a6b0a176386 100644
--- a/Makefile
+++ b/Makefile
@@ -101,11 +101,7 @@ KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
 KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
 
-# This is a commit from CR main (22.05.2024).
-# Intentionally using a commit from main to use a setup-envtest version
-# that uses binaries from controller-tools, not GCS.
-# CR PR: https://github.com/kubernetes-sigs/controller-runtime/pull/2811
-SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
+SETUP_ENVTEST_VER := release-0.19
 SETUP_ENVTEST_BIN := setup-envtest
 SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
 SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest