diff --git a/klone.yaml b/klone.yaml
index c027617..4e2096b 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -10,45 +10,45 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 8f89bfef199543e41c5b6bbbf722a4f5f0f9e0fb
+      repo_hash: dd3c1e710614cfe5fb4c6597f5494c83d250930f
       repo_path: modules/tools
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
index 6171c17..93be7c9 100644
--- a/make/_shared/tools/00_mod.mk
+++ b/make/_shared/tools/00_mod.mk
@@ -232,8 +232,6 @@ endef
 
 $(foreach tool,$(tools),$(eval $(call tool_defs,$(word 1,$(subst =, ,$(tool))),$(word 2,$(subst =, ,$(tool))))))
 
-tools_paths := $(tool_names:%=$(bin_dir)/tools/%)
-
 ######
 # Go #
 ######
@@ -365,7 +363,10 @@ $(call for_each_kv,go_tags_init,$(go_dependencies))
 go_tags_defs = go_tags_$1 += $2
 $(call for_each_kv,go_tags_defs,$(go_tags))
 
+go_tool_names :=
+
 define go_dependency
+go_tool_names += $1
 $$(DOWNLOAD_DIR)/tools/$1@$($(call uc,$1)_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $$(NEEDS_GO) $$(DOWNLOAD_DIR)/tools
 	@source $$(lock_script) $$@; \
 		mkdir -p $$(outfile).dir; \
@@ -642,7 +643,22 @@ ifneq ($(missing),)
 $(error Missing required tools: $(missing))
 endif
 
+non_go_tool_names := $(filter-out $(go_tool_names),$(tool_names))
+
+.PHONY: non-go-tools
+## Download and setup all Go tools
+## @category [shared] Tools
+non-go-tools: $(non_go_tool_names:%=$(bin_dir)/tools/%)
+
+.PHONY: go-tools
+## Download and setup all Non-Go tools
+## NOTE: this target is also used to learn the shas of
+## these tools (see scripts/learn_tools_shas.sh in the
+## Makefile modules repo)
+## @category [shared] Tools
+go-tools: $(go_tool_names:%=$(bin_dir)/tools/%)
+
 .PHONY: tools
 ## Download and setup all tools
 ## @category [shared] Tools
-tools: $(tools_paths)
+tools: non-go-tools go-tools