diff --git a/klone.yaml b/klone.yaml
index a3419625..31e13218 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -10,70 +10,70 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: c483ab2d13b83e4b9de1f09c85509c803e0c1ed8
+      repo_hash: a72a37ec62c582feb42af733ecfa2b5ed27fec1c
       repo_path: modules/tools
diff --git a/make/_shared/kind/00_kind_image_versions.mk b/make/_shared/kind/00_kind_image_versions.mk
index 8239a5d4..dead2cb5 100755
--- a/make/_shared/kind/00_kind_image_versions.mk
+++ b/make/_shared/kind/00_kind_image_versions.mk
@@ -21,8 +21,8 @@ kind_image_kube_1.25_amd64 := docker.io/kindest/node:v1.25.16@sha256:fedeb7ebef9
 kind_image_kube_1.25_arm64 := docker.io/kindest/node:v1.25.16@sha256:f16a9c7caa65d394176ce2e628eb371d5af8b7bd913e88c826a357cadde698c7
 kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:290e3765fbabbeb2ddcde36bdf3e8452166dc94a4c970a25c10290ebd480ca6e
 kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:7b34bc4f381a4aa0bd81239bbc2af5f44d933c11b3510da85f13cf8b2a34c9fd
-kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.17@sha256:84aff282b523c3943c374d95807e1e748ccd43432dce614d6c7a148a7028fb01
-kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.17@sha256:2c6de687b6ea20b385c0b18b85d4e55e214882b3cbde857974ccfe010f4a90a9
+kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.16@sha256:84aff282b523c3943c374d95807e1e748ccd43432dce614d6c7a148a7028fb01
+kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.16@sha256:2c6de687b6ea20b385c0b18b85d4e55e214882b3cbde857974ccfe010f4a90a9
 kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.13@sha256:d97df9fff48099bf9a94c92fdc39adde65bec2aa1d011f84233b96172c1003c9
 kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.13@sha256:ddef612bb93a9aa3a989f9d3d4e01c0a7c4d866a4b949264146c182cd202d738
 kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.8@sha256:b69a150f9951ef41158ec76de381a920df2be3582fd16fc19cf4757eef0dded9