diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
index 8659cc2d59..f1d7c8608b 100755
--- a/stable/metrics-server/Chart.yaml
+++ b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.3.6
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 2.10.2
+version: 2.11.0
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server
diff --git a/stable/metrics-server/templates/auth-delegator-crb.yaml b/stable/metrics-server/templates/auth-delegator-crb.yaml
index 82dd14a3a7..e82fca0654 100644
--- a/stable/metrics-server/templates/auth-delegator-crb.yaml
+++ b/stable/metrics-server/templates/auth-delegator-crb.yaml
@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ template "metrics-server.fullname" . }}:system:auth-delegator
-  namespace: kube-system
   labels:
     app: {{ template "metrics-server.name" . }}
     chart: {{ template "metrics-server.chart" . }}
diff --git a/stable/metrics-server/templates/metric-server-service.yaml b/stable/metrics-server/templates/metric-server-service.yaml
index 222bc78587..0d64cd1401 100644
--- a/stable/metrics-server/templates/metric-server-service.yaml
+++ b/stable/metrics-server/templates/metric-server-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "metrics-server.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "metrics-server.name" . }}
     chart: {{ template "metrics-server.chart" . }}
diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml
index 2c1a0c737a..3158f41d0c 100644
--- a/stable/metrics-server/templates/metrics-server-deployment.yaml
+++ b/stable/metrics-server/templates/metrics-server-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "metrics-server.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "metrics-server.name" . }}
     chart: {{ template "metrics-server.chart" . }}
diff --git a/stable/metrics-server/templates/metrics-server-serviceaccount.yaml b/stable/metrics-server/templates/metrics-server-serviceaccount.yaml
index afcdaf859f..4d748ed568 100644
--- a/stable/metrics-server/templates/metrics-server-serviceaccount.yaml
+++ b/stable/metrics-server/templates/metrics-server-serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "metrics-server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "metrics-server.name" . }}
     chart: {{ template "metrics-server.chart" . }}