diff --git a/charts/trino/Chart.yaml b/charts/trino/Chart.yaml
index 1dba6a2..99ae67b 100644
--- a/charts/trino/Chart.yaml
+++ b/charts/trino/Chart.yaml
@@ -15,7 +15,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: 0.19.0
+version: 0.20.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/charts/trino/templates/configmap-coordinator.yaml b/charts/trino/templates/configmap-coordinator.yaml
index ba88283..997e3b5 100644
--- a/charts/trino/templates/configmap-coordinator.yaml
+++ b/charts/trino/templates/configmap-coordinator.yaml
@@ -38,6 +38,9 @@ data:
     -XX:+UnlockDiagnosticVMOptions
     # Reduce starvation of threads by GClocker, recommend to set about the number of cpu cores (JDK-8192647)
     -XX:GCLockerRetryAllocationCount=32
+  {{- if .Values.jmx.enabled }}
+    -Dcom.sun.management.jmxremote.rmi.port={{ .Values.jmx.serverPort }}
+  {{- end }}
   {{- range $configValue := .Values.coordinator.additionalJVMConfig }}
     {{ $configValue }}
   {{- end }}
@@ -67,6 +70,10 @@ data:
     http-server.https.port={{ .Values.server.config.https.port }}
     http-server.https.keystore.path={{ .Values.server.config.https.keystore.path }}
   {{- end }}
+  {{- if .Values.jmx.enabled }}
+    jmx.rmiregistry.port={{ .Values.jmx.registryPort }}
+    jmx.rmiserver.port={{ .Values.jmx.serverPort }}
+  {{- end }}
   {{ .Values.server.coordinatorExtraConfig | indent 4 }}
 
 {{- if .Values.accessControl }}{{- if eq .Values.accessControl.type "configmap" }}
diff --git a/charts/trino/templates/deployment-coordinator.yaml b/charts/trino/templates/deployment-coordinator.yaml
index 844be4e..a4a2e28 100644
--- a/charts/trino/templates/deployment-coordinator.yaml
+++ b/charts/trino/templates/deployment-coordinator.yaml
@@ -142,6 +142,14 @@ spec:
             - name: http
               containerPort: {{ .Values.service.port }}
               protocol: TCP
+            {{-if .Values.jmx.enabled }}
+            - name: jmx-registry
+              containerPort: {{ .Values.jmx.registryPort }}
+              protocol: TCP
+            - name: jmx-server
+              containerPort: {{ .Values.jmx.serverPort }}
+              protocol: TCP
+            {{- end }}
           {{- range $key, $value := .Values.coordinator.additionalExposedPorts }}
             - name: {{ $value.name }}
               containerPort: {{ $value.port }}
diff --git a/charts/trino/templates/service.yaml b/charts/trino/templates/service.yaml
index cfb0b2f..acb1b2c 100644
--- a/charts/trino/templates/service.yaml
+++ b/charts/trino/templates/service.yaml
@@ -14,6 +14,16 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+    {{- if .Values.jmx.enabled }}
+    - port: {{ .Values.jmx.registryPort }}
+      targetPort: jmx-registry
+      protocol: TCP
+      name: jmx-registry
+    - port: {{ .Values.jmx.serverPort }}
+      targetPort: jmx-server
+      protocol: TCP
+      name: jmx-server
+    {{- end }}
     {{- range $key, $value := .Values.coordinator.additionalExposedPorts }}
     - port: {{ $value.servicePort }}
       name: {{ $value.name }}
diff --git a/charts/trino/values.yaml b/charts/trino/values.yaml
index 04e0d19..f2b4d3a 100644
--- a/charts/trino/values.yaml
+++ b/charts/trino/values.yaml
@@ -14,6 +14,10 @@ imagePullSecrets:
   - name: registry-credentials
 
 server:
+  jmx:
+    enabled: true
+    registryPort: 9080
+    serverPort: 9081
   workers: 2
   node:
     environment: production