diff --git a/chart/templates/proxy-deployment.yaml b/chart/templates/proxy-deployment.yaml
index 65ee05d6bd..a9b28701e0 100644
--- a/chart/templates/proxy-deployment.yaml
+++ b/chart/templates/proxy-deployment.yaml
@@ -51,6 +51,7 @@ spec:
             - -c
             - "sysctl -w net.core.somaxconn=32768; sysctl -w net.ipv4.ip_local_port_range='1024 65000'"
       containers:
+{{ include "gitpod.kube-rbac-proxy" $this | indent 6 }}
       - name: proxy
         image: {{ template "gitpod.comp.imageFull" $this }}
 {{ include "gitpod.container.imagePullPolicy" $this | indent 8 }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 201a63173a..090f7852ae 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -430,6 +430,9 @@ components:
       https:
         expose: true
         containerPort: 443
+      metrics:
+        expose: false
+        containerPort: 9500
     loadBalancerIP: null
     serviceType: "LoadBalancer"
     serviceSessionAffinity: "None"
diff --git a/components/proxy/conf/Caddyfile b/components/proxy/conf/Caddyfile
index 0b46854a7f..8a70b9f5f2 100644
--- a/components/proxy/conf/Caddyfile
+++ b/components/proxy/conf/Caddyfile
@@ -129,7 +129,9 @@
 :8003 {
 	respond /live 200
 	respond /ready 200
+}
 
+127.0.0.1:9500 {
 	metrics /metrics {
 		disable_openmetrics
 	}