diff --git a/bitnami/kube-state-metrics/Chart.yaml b/bitnami/kube-state-metrics/Chart.yaml
index f85d11adca..28a45e0184 100644
--- a/bitnami/kube-state-metrics/Chart.yaml
+++ b/bitnami/kube-state-metrics/Chart.yaml
@@ -23,4 +23,4 @@ name: kube-state-metrics
 sources:
   - https://github.com/bitnami/bitnami-docker-kube-state-metrics
   - https://github.com/kubernetes/kube-state-metrics
-version: 2.2.16
+version: 2.2.17
diff --git a/bitnami/kube-state-metrics/templates/service.yaml b/bitnami/kube-state-metrics/templates/service.yaml
index bd76fe27b9..cbe2cb651f 100644
--- a/bitnami/kube-state-metrics/templates/service.yaml
+++ b/bitnami/kube-state-metrics/templates/service.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     {{- if not .Values.serviceMonitor.enabled }}
     prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.service.port | quote }}
     {{- end }}
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}