diff --git a/bitnami/tomcat/Chart.yaml b/bitnami/tomcat/Chart.yaml
index c05985685..b45ac8776 100644
--- a/bitnami/tomcat/Chart.yaml
+++ b/bitnami/tomcat/Chart.yaml
@@ -26,4 +26,4 @@ name: tomcat
 sources:
   - https://github.com/bitnami/bitnami-docker-tomcat
   - http://tomcat.apache.org
-version: 10.1.6
+version: 10.1.7
diff --git a/bitnami/tomcat/templates/_pod.tpl b/bitnami/tomcat/templates/_pod.tpl
index 5c8978bae..0f261ea87 100644
--- a/bitnami/tomcat/templates/_pod.tpl
+++ b/bitnami/tomcat/templates/_pod.tpl
@@ -135,35 +135,32 @@ containers:
       {{- if .Values.extraVolumeMounts }}
       {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 6 }}
       {{- end }}
-{{- if .Values.sidecars }}
-{{ include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) }}
-{{- end }}
-{{- if .Values.metrics.jmx.enabled }}
-- name: jmx-exporter
-  image: {{ template "tomcat.metrics.jmx.image" . }}
-  imagePullPolicy: {{ .Values.metrics.jmx.image.pullPolicy | quote }}
-  command:
-    - java
-    - -XX:+UnlockExperimentalVMOptions
-    - -XX:+UseCGroupMemoryLimitForHeap
-    - -XX:MaxRAMFraction=1
-    - -XshowSettings:vm
-    - -jar
-    - jmx_prometheus_httpserver.jar
-    - {{ .Values.metrics.jmx.ports.metrics | quote }}
-    - /etc/jmx-tomcat/jmx-tomcat-prometheus.yml
-  ports:
-  {{- range $key, $val := .Values.metrics.jmx.ports }}
-    - name: {{ $key }}
-      containerPort: {{ $val }}
+  {{- if .Values.metrics.jmx.enabled }}
+  - name: jmx-exporter
+    image: {{ template "tomcat.metrics.jmx.image" . }}
+    imagePullPolicy: {{ .Values.metrics.jmx.image.pullPolicy | quote }}
+    command:
+      - java
+      - -XX:+UnlockExperimentalVMOptions
+      - -XX:+UseCGroupMemoryLimitForHeap
+      - -XX:MaxRAMFraction=1
+      - -XshowSettings:vm
+      - -jar
+      - jmx_prometheus_httpserver.jar
+      - {{ .Values.metrics.jmx.ports.metrics | quote }}
+      - /etc/jmx-tomcat/jmx-tomcat-prometheus.yml
+    ports:
+    {{- range $key, $val := .Values.metrics.jmx.ports }}
+      - name: {{ $key }}
+        containerPort: {{ $val }}
+    {{- end }}
+    {{- if .Values.metrics.jmx.resources }}
+    resources: {{- toYaml .Values.metrics.jmx.resources | nindent 6 }}
+    {{- end }}
+    volumeMounts:
+      - name: jmx-config
+        mountPath: /etc/jmx-tomcat
   {{- end }}
-  {{- if .Values.metrics.jmx.resources }}
-  resources: {{- toYaml .Values.metrics.jmx.resources | nindent 4 }}
-  {{- end }}
-  volumeMounts:
-    - name: jmx-config
-      mountPath: /etc/jmx-tomcat
-{{- end }}
   {{- if .Values.sidecars }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.sidecars "context" $) | nindent 2 }}
   {{- end }}
@@ -178,6 +175,11 @@ volumes:
     emptyDir: {}
   {{- end }}
   {{- end }}
+  {{- if and .Values.metrics.jmx.enabled (or .Values.metrics.jmx.config .Values.metrics.jmx.existingConfigmap) }}
+  - configMap:
+      name: {{ include "tomcat.metrics.jmx.configmapName" . }}
+    name: jmx-config
+  {{- end }}
   {{- if .Values.extraVolumes }}
   {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 2 }}
   {{- end }}
diff --git a/bitnami/tomcat/templates/podmonitor.yaml b/bitnami/tomcat/templates/podmonitor.yaml
index b9f1b9832..41f91fee4 100644
--- a/bitnami/tomcat/templates/podmonitor.yaml
+++ b/bitnami/tomcat/templates/podmonitor.yaml
@@ -8,12 +8,16 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- if .Values.metrics.podMonitor.additionalLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podMonitor.additionalLabels "context" $ ) | nindent 4 }}
+    {{- end }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.metrics.podMonitor.podTargetLabels }}
   podTargetLabels: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podMonitor.podTargetLabels "context" $ ) | nindent 4 }}
+  {{- end }}
   podMetricsEndpoints:
 {{- range $key, $val := .Values.metrics.jmx.ports }}
     - port: {{ $key | quote }}