diff --git a/class/defaults.yml b/class/defaults.yml
index 528c431..ba0a741 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -16,9 +16,9 @@ parameters:
         image: appuio/machine-api-provider-cloudscale
         tag: v0.2.5
       kube_rbac_proxy:
-        registry: gcr.io
-        image: kubebuilder/kube-rbac-proxy
-        tag: v0.16.0
+        registry: quay.io
+        image: brancz/kube-rbac-proxy
+        tag: v0.18.2
 
     resources:
       provider:
diff --git a/tests/golden/defaults/machine-api-provider-cloudscale/machine-api-provider-cloudscale/11_deployment.yaml b/tests/golden/defaults/machine-api-provider-cloudscale/machine-api-provider-cloudscale/11_deployment.yaml
index 1b15936..b91643c 100644
--- a/tests/golden/defaults/machine-api-provider-cloudscale/machine-api-provider-cloudscale/11_deployment.yaml
+++ b/tests/golden/defaults/machine-api-provider-cloudscale/machine-api-provider-cloudscale/11_deployment.yaml
@@ -96,7 +96,7 @@ spec:
             - --upstream=http://localhost:8080
             - --logtostderr=true
             - --v=0
-          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
+          image: quay.io/brancz/kube-rbac-proxy:v0.18.2
           imagePullPolicy: IfNotPresent
           name: kube-rbac-proxy-manager-metrics
           ports:
@@ -114,7 +114,7 @@ spec:
             - --upstream=http://localhost:8082
             - --logtostderr=true
             - --v=0
-          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0
+          image: quay.io/brancz/kube-rbac-proxy:v0.18.2
           imagePullPolicy: IfNotPresent
           name: kube-rbac-proxy-mac-metrics
           ports: