diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index e3a77772..35367ea5 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -1,3 +1,6 @@
+# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
+
 # Update Go dependencies and GitHub Actions dependencies weekly.
 version: 2
 updates:
diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
index 9a758e57..5e0bd276 100644
--- a/.github/workflows/make-self-upgrade.yaml
+++ b/.github/workflows/make-self-upgrade.yaml
@@ -67,7 +67,7 @@ jobs:
             const pulls = await github.rest.pulls.list({
               owner: owner,
               repo: repo,
-              head: 'self-upgrade',
+              head: owner + ':self-upgrade',
               base: 'main',
               state: 'open',
             });
diff --git a/klone.yaml b/klone.yaml
index 93461680..a0c51e53 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -10,60 +10,60 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/generate-verify
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/klone
     - folder_name: oci-image
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/oci-image
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 5f23abc93e192e49875d3e7de88ddff00c7331a8
+      repo_hash: 7e5bc953cd6d1196a0f35723b7a38151c76440ab
       repo_path: modules/tools
diff --git a/make/_shared/repository-base/base/.github/dependabot.yaml b/make/_shared/repository-base/base/.github/dependabot.yaml
new file mode 100644
index 00000000..35367ea5
--- /dev/null
+++ b/make/_shared/repository-base/base/.github/dependabot.yaml
@@ -0,0 +1,20 @@
+# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
+
+# Update Go dependencies and GitHub Actions dependencies weekly.
+version: 2
+updates:
+- package-ecosystem: gomod
+  directory: /
+  schedule:
+    interval: weekly
+  groups:
+    all:
+      patterns: ["*"]
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: weekly
+  groups:
+    all:
+      patterns: ["*"]
diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
index 9a758e57..5e0bd276 100644
--- a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
+++ b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -67,7 +67,7 @@ jobs:
             const pulls = await github.rest.pulls.list({
               owner: owner,
               repo: repo,
-              head: 'self-upgrade',
+              head: owner + ':self-upgrade',
               base: 'main',
               state: 'open',
             });