diff --git a/klone.yaml b/klone.yaml
index c2b4cbf2b0..8a05d27b39 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -10,30 +10,30 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
+      repo_hash: 8efc8e49b062c3f1b059079f532ee342db79c3cc
       repo_path: modules/tools
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
index b939f58361..6d2204d3cb 100644
--- a/make/_shared/tools/00_mod.mk
+++ b/make/_shared/tools/00_mod.mk
@@ -56,7 +56,7 @@ tools += helm=v3.15.4
 # https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
 tools += kubectl=v1.31.0
 # https://github.com/kubernetes-sigs/kind/releases
-tools += kind=v0.24.0
+tools += kind=v0.25.0
 # https://www.vaultproject.io/downloads
 tools += vault=1.17.3
 # https://github.com/Azure/azure-workload-identity/releases
@@ -416,10 +416,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
 		$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
 		chmod +x $(outfile)
 
-kind_linux_amd64_SHA256SUM=b89aada5a39d620da3fcd16435b7f28d858927dd53f92cbac77686b0588b600d
-kind_linux_arm64_SHA256SUM=2968808d916e12d0a25c56d07c9a1c987163f972513fa8a94a2125a69f9c50eb
-kind_darwin_amd64_SHA256SUM=6cf7ba50b37d3446153bbfb8990f03fb8102778898c84502cdb841710b499ed5
-kind_darwin_arm64_SHA256SUM=8e34f2edc7efc5c7c160487251848a954cd60ccd52b56a3fc360eaab33543fc0
+kind_linux_amd64_SHA256SUM=b22ff7e5c02b8011e82cc3223d069d178b9e1543f1deb21e936d11764780a3d8
+kind_linux_arm64_SHA256SUM=06e544e3f12ea54de5962ceaecd97513a25dbab4168a44f03f01833349afdda3
+kind_darwin_amd64_SHA256SUM=180404ae1c0de8d333583d2958cdfac5338ec3e32cd765a158cfd6d09eb8cd7d
+kind_darwin_arm64_SHA256SUM=222701bb72ff596928c57b3c64ca3e0b969d593ef24ccc790f9c17904e7b63ea
 
 .PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
 $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools