diff --git a/Makefile b/Makefile
index 2857ed8d9..818e3b6d2 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ SKIP_RANGE ?=
 # the kube-rbac-proxy can easily be tested. Products that include CSI-Addons
 # may want to provide a different location of the container-image.
 # The default value is set in config/default/kustomization.yaml
-RBAC_PROXY_IMG ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+RBAC_PROXY_IMG ?= quay.io/brancz/kube-rbac-proxy:v0.18.0
 
 # The default version of the bundle (CSV) can be found in
 # config/manifests/bases/csi-addons.clusterserviceversion.yaml . When tagging a
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index c7ed8f70a..4cbda177d 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -29,7 +29,7 @@ images:
   newName: quay.io/csiaddons/k8s-controller
   newTag: latest
 - name: rbac-proxy
-  newName: gcr.io/kubebuilder/kube-rbac-proxy
-  newTag: v0.8.0
+  newName: quay.io/brancz/kube-rbac-proxy
+  newTag: v0.18.0
 patches:
 - path: manager_auth_proxy_patch.yaml
diff --git a/deploy/controller/setup-controller.yaml b/deploy/controller/setup-controller.yaml
index 1dee00323..d602b6024 100644
--- a/deploy/controller/setup-controller.yaml
+++ b/deploy/controller/setup-controller.yaml
@@ -52,7 +52,7 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=10
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+        image: quay.io/brancz/kube-rbac-proxy:v0.18.0
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443