diff --git a/.golangci.yaml b/.golangci.yaml
index acefab7..42a70e4 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -19,6 +19,7 @@ linters:
     - bidichk
     - bodyclose
     - contextcheck
+    - copyloopvar
     - decorder
     - dogsled
     - dupword
@@ -27,7 +28,6 @@ linters:
     - errchkjson
     - errname
     - exhaustive
-    - exportloopref
     - forbidigo
     - gci
     - ginkgolinter
diff --git a/klone.yaml b/klone.yaml
index 8bb902b..57354ab 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: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 0ffb274185564894561da55c6a262d817661b942
+      repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
       repo_path: modules/tools
diff --git a/make/_shared/go/.golangci.override.yaml b/make/_shared/go/.golangci.override.yaml
index 9e8dcd1..a40c8de 100644
--- a/make/_shared/go/.golangci.override.yaml
+++ b/make/_shared/go/.golangci.override.yaml
@@ -7,6 +7,7 @@ linters:
     - bidichk
     - bodyclose
     - contextcheck
+    - copyloopvar
     - decorder
     - dogsled
     - dupword
@@ -15,7 +16,6 @@ linters:
     - errchkjson
     - errname
     - exhaustive
-    - exportloopref
     - forbidigo
     - gci
     - ginkgolinter
diff --git a/make/_shared/oci-build/00_mod.mk b/make/_shared/oci-build/00_mod.mk
index b7e2b0b..aed327d 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:262e3020adb3b09ddbf9cd8fe672330451a556c8e7024142fa205c8876c3fd75
+base_image_static := quay.io/jetstack/base-static@sha256:cabab50de0aff1134320f01a00cbe00efdecbe01b7661377b87ecda45485ff97
 
 # 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:f776795838d73f9836b134f688b4c827fcd7ed22f46d3cefcb9f57d668388fef
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:7d424631e58b74d2fe01ecf5ffb20296fe4ce74bd3adef3738c183c53be3baea
 
 # Utility functions
 fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))