diff --git a/weaviate/Chart.yaml b/weaviate/Chart.yaml
index dba116b..d49ce28 100644
--- a/weaviate/Chart.yaml
+++ b/weaviate/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 17.6.1
+version: 17.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/weaviate/templates/weaviateService.yaml b/weaviate/templates/weaviateService.yaml
index feaf496..ea940d5 100644
--- a/weaviate/templates/weaviateService.yaml
+++ b/weaviate/templates/weaviateService.yaml
@@ -18,8 +18,13 @@ spec:
   ports:
     {{- range .Values.service.ports }}
     - {{ toYaml . | indent 6 | trim }}
-      targetPort: 8080
     {{- end }}
+    {{- if .Values.serviceMonitor.enabled }}
+    - name: metrics
+      protocol: TCP
+      port: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
+      targetPort: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
+    {{ end }}
 {{ if eq .Values.service.type "ClusterIP" -}}
   {{ if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
diff --git a/weaviate/templates/weaviateServiceMonitor.yaml b/weaviate/templates/weaviateServiceMonitor.yaml
index e4191fd..f914709 100644
--- a/weaviate/templates/weaviateServiceMonitor.yaml
+++ b/weaviate/templates/weaviateServiceMonitor.yaml
@@ -8,6 +8,9 @@ metadata:
     app: weaviate
     app.kubernetes.io/name: weaviate
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- if .Values.serviceMonitor.additionalLabels }}
+    {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
 spec:
   jobLabel: weaviate
   selector:
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index c785ffa..2294f52 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -484,7 +484,7 @@ spec:
           - containerPort: 8080
           {{- if .Values.env.PROMETHEUS_MONITORING_ENABLED }}
           - name: metrics
-            containerPort: 2112
+            containerPort: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
             protocol: TCP
           {{- end }}
           {{ if .Values.grpcService.enabled }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index 7480c8c..5205e7b 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -134,7 +134,7 @@ service:
     - name: http
       protocol: TCP
       port: 80
-      # Target port is going to be the same for every port
+      targetPort: 8080
   type: LoadBalancer
   loadBalancerSourceRanges: []
   # optionally set cluster IP if you want to set a static IP
@@ -168,6 +168,7 @@ serviceMonitor:
   enabled: false
   interval: 30s
   scrapeTimeout: 10s
+  additionalLabels: {}
 
 # Adjust liveness, readiness and startup probes configuration
 # below is an example that can be used to switch the probeType to exec command
@@ -320,6 +321,7 @@ env:
   # Expose metrics on port 2112 for Prometheus to scrape
   PROMETHEUS_MONITORING_ENABLED: false
   PROMETHEUS_MONITORING_GROUP: false
+  PROMETHEUS_MONITORING_PORT: 2112
 
   # Set a MEM limit for the Weaviate Pod so it can help you both increase GC-related
   # performance as well as avoid GC-related out-of-memory (“OOM”) situations