diff --git a/stable/metrics-server-exporter/Chart.yaml b/stable/metrics-server-exporter/Chart.yaml
index 9fd9277c..c338cd11 100644
--- a/stable/metrics-server-exporter/Chart.yaml
+++ b/stable/metrics-server-exporter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: ">=2.0.0"
-version: 0.9.0
+version: 0.9.1
 description: K8s metrics exporter in prometheus format
 name: metrics-server-exporter
 home: https://iguazio.com
diff --git a/stable/metrics-server-exporter/templates/metrics-server-exporter-deployment.yaml b/stable/metrics-server-exporter/templates/metrics-server-exporter-deployment.yaml
index 2a735b2d..8cf7cf75 100644
--- a/stable/metrics-server-exporter/templates/metrics-server-exporter-deployment.yaml
+++ b/stable/metrics-server-exporter/templates/metrics-server-exporter-deployment.yaml
@@ -36,6 +36,8 @@ spec:
         - --namespace={{ .Release.Namespace }}
         - --listen-addr=:{{ .Values.container.port }}
         - --handle-gpu-metrics={{ .Values.container.handleGPUMetrics }}
+        - --status-field-selector={{ .Values.container.statusFieldSelector }}
+        - --pod-list-limit={{ .Values.container.podListLimit }}
         ports:
         - containerPort: {{ .Values.container.port }}
           protocol: {{ .Values.container.protocol }}
diff --git a/stable/metrics-server-exporter/values.yaml b/stable/metrics-server-exporter/values.yaml
index 39ffe469..eb2fe448 100644
--- a/stable/metrics-server-exporter/values.yaml
+++ b/stable/metrics-server-exporter/values.yaml
@@ -13,6 +13,8 @@ container:
   logLevel: info
 
   handleGPUMetrics: false
+  statusFieldSelector: status.phase=Running
+  podListLimit: 100
 
 service:
   port: 9104