diff --git a/infrastructure/kube-system/metrics-server.yaml b/infrastructure/kube-system/metrics-server.yaml
index b632f797c820500317ae122296cb0126b2db3dea..31e797dccb65104312df1e7835b424c5eb3a1e76 100644
--- a/infrastructure/kube-system/metrics-server.yaml
+++ b/infrastructure/kube-system/metrics-server.yaml
@@ -27,10 +27,10 @@ spec:
   values:
     replicas: 2
     defaultArgs:
-      - --cert-dir=/tmp
-      - --kubelet-preferred-address-types=Hostname,InternalIP,ExternalIP
+      - --cert-dir=/ca
       - --kubelet-use-node-status-port
       - --metric-resolution=15s
+      - --enable-aggregator-routing=true
     rbac:
       pspEnabled: true
     podDisruptionBudget:
@@ -42,6 +42,14 @@ spec:
         cpu: 100m
       limits:
         memory: 512Mi
+    extraVolumes:
+      - configMap:
+          defaultMode: 420
+          name: kube-root-ca.crt
+        name: kube-ca
+    extraVolumeMounts:
+      - mountPath: /ca
+        name: kube-ca
     service:
       labels:
         kubernetes.io/cluster-service: "true"