diff --git a/klone.yaml b/klone.yaml
index b2da73f4..4a7c10fb 100644
--- a/klone.yaml
+++ b/klone.yaml
@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501
+      repo_hash: 96e1cbdc4dbc774d94473dc86803f62ea018cb70
       repo_path: modules/tools
diff --git a/make/_shared/oci-build/00_mod.mk b/make/_shared/oci-build/00_mod.mk
index 31de7c1a..973d0d27 100644
--- a/make/_shared/oci-build/00_mod.mk
+++ b/make/_shared/oci-build/00_mod.mk
@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
 
 # Use distroless as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
-base_image_static := quay.io/jetstack/base-static@sha256:feae5ef1171e639476e4134057228e0355837642993adfcb2b5c77fdc9c51d7d
+base_image_static := quay.io/jetstack/base-static@sha256:2e8bb0078d021af309b83742f8a810b490393ef082761b589145e6be07f9bdf8
 
 # Use custom apko-built image as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
-base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:9e92ef3912568138f865b2268d3f13285736fb55856342cd32456ae2e284658b
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:ca75c3365e08dfc07b397c72ea83c05cc870234859a92cadbd462cdc97d014c2
 
 # Utility functions
 fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))