diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4411285b..624c5c8a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -43,13 +43,15 @@ repos:
   - id: gitlint
     stages: [commit-msg]
 - repo: https://github.com/jumanjihouse/pre-commit-hooks
-  rev: 2.1.5
+  rev: 3.0.0
   hooks:
-  - id: script-must-have-extension
-    stages: [commit]
+    - id: script-must-have-extension
+      stages: [commit]
+      exclude: \.envrc$
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.7.2.1
+  rev: v0.10.0.1
   hooks:
-  - id: shellcheck
-    stages: [commit]
-    args: ["-e", "SC2211"]
+    - id: shellcheck
+      stages: [commit]
+      args: ["-e", "SC2211"]
+      exclude: \.envrc$
diff --git a/hack/images.yaml b/hack/images.yaml
index 9486bfd3..7231fe62 100644
--- a/hack/images.yaml
+++ b/hack/images.yaml
@@ -3,7 +3,7 @@ kafka-0.25.2:
   - "ghcr.io/mesosphere/cruise-control:2.5.139"
   - "ghcr.io/mesosphere/dkp-container-images/ghcr.io/banzaicloud/kafka:2.13-3.4.1-d2iq.1"
   - "ghcr.io/mesosphere/jmx-javaagent:0.18.0"
-  - "gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1"
+  - "quay.io/brancz/kube-rbac-proxy:v0.14.1"
 zookeeper-0.2.16-dkp.3:
   - "ghcr.io/mesosphere/zookeeper-operator:0.2.15-d2iq"
   - "ghcr.io/mesosphere/zookeeper:0.2.15-d2iq"
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index e31f8ecd..b5d94ffa 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -9,7 +9,7 @@ resources:
       - url: https://github.com/mesosphere/zookeeper-operator
         ref: v${image_tag}
         license_path: LICENSE
-  - container_image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
+  - container_image: quay.io/brancz/kube-rbac-proxy:v0.14.1
     sources:
       - url: https://github.com/brancz/kube-rbac-proxy
         ref: ${image_tag}
diff --git a/services/kafka-operator/0.25.1/defaults/cm.yaml b/services/kafka-operator/0.25.1/defaults/cm.yaml
index 0424632e..d82235a0 100644
--- a/services/kafka-operator/0.25.1/defaults/cm.yaml
+++ b/services/kafka-operator/0.25.1/defaults/cm.yaml
@@ -14,5 +14,5 @@ data:
     prometheusMetrics:
       authProxy:
         image:
-          repository: gcr.io/kubebuilder/kube-rbac-proxy
+          repository: quay.io/brancz/kube-rbac-proxy
           tag: v0.14.1
diff --git a/services/kafka-operator/0.25.2/defaults/cm.yaml b/services/kafka-operator/0.25.2/defaults/cm.yaml
index 31fab2ea..48a6ce87 100644
--- a/services/kafka-operator/0.25.2/defaults/cm.yaml
+++ b/services/kafka-operator/0.25.2/defaults/cm.yaml
@@ -14,5 +14,5 @@ data:
     prometheusMetrics:
       authProxy:
         image:
-          repository: gcr.io/kubebuilder/kube-rbac-proxy
+          repository: quay.io/brancz/kube-rbac-proxy
           tag: v0.14.1