diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
index f056e7a1b1..c2971c4135 100644
--- a/.github/workflows/make-self-upgrade.yaml
+++ b/.github/workflows/make-self-upgrade.yaml
@@ -38,7 +38,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 
diff --git a/klone.yaml b/klone.yaml
index 6c69ceb646..431ca8650b 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: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: f3e160d4854e9b522f0d4150d41ddac049b0b85a
+      repo_hash: bbdd3178ba72a23eb776d05770b9ff1b461b0546
       repo_path: modules/tools