diff --git a/defaults/main.yml b/defaults/main.yml
index c764d7e..ba7182d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,8 +3,8 @@
 shinyproxy_install: True
 shinyproxy_as_docker_service: False
 shinyproxy_major_ver: 2
-shinyproxy_minor_ver: 3
-shinyproxy_patch_ver: 1
+shinyproxy_minor_ver: 5
+shinyproxy_patch_ver: 0
 shinyproxy_version: '{{ shinyproxy_major_ver }}.{{ shinyproxy_minor_ver }}.{{ shinyproxy_patch_ver }}'
 shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
 shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
@@ -19,6 +19,8 @@ shinyproxy_http_port: 8080
 shinyproxy_heartbeat_rate: 10000
 shinyproxy_heartbeat_timeout: 60000
 shinyproxy_undertow_loglevel: 'INFO'
+shinyproxy_prometheus_port: 9090
+shinyproxy_expose_prometheus: True
 # 30 minutes
 shinyproxy_server_session_timeout: 1800
 # For logrotate. In days
diff --git a/templates/shinyproxy-2-conf.yml.j2 b/templates/shinyproxy-2-conf.yml.j2
index b9d6b34..ff92ac0 100644
--- a/templates/shinyproxy-2-conf.yml.j2
+++ b/templates/shinyproxy-2-conf.yml.j2
@@ -25,6 +25,9 @@ proxy:
   template-path: {{ shinyproxy_template_path }}
 {% endif %}
   authentication: {{ shinyproxy_authentication }}
+{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
+  usage-stats-url: micrometer
+{% endif %}
   admin-groups: {{ shinyproxy_admin_group }}
   container-backend: {{ shinyproxy_container_backend }}
 {% if shinyproxy_ldap_enabled %}
@@ -102,6 +105,14 @@ proxy:
 security:
   basic:
     enabled: {{ shinyproxy_basic_auth }}
+
+{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
+management:
+  metrics:
+    export:
+      prometheus:
+        enabled: true
+{% endif %}
     
 logging:
   file: {{ shinyproxy_log_dir }}/shinyproxy.log
diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2
index b023b28..19448f7 100644
--- a/templates/shinyproxy-docker-compose.yml.j2
+++ b/templates/shinyproxy-docker-compose.yml.j2
@@ -18,8 +18,15 @@ services:
     build: .
     ports:
       - '{{ shinyproxy_http_port }}':'{{ shinyproxy_http_port }}'
+{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
+      - '{{ shinyproxy_prometheus_port }}':'{{ shinyproxy_prometheus_port }}'
+{% endif %}
 {% else %}
     image: {{ shinyproxy_docker_image }}
+{% if shinyproxy_expose_prometheus and shinyproxy_version is version_compare('2.5.0', '>=') %}
+    ports:
+      - '{{ shinyproxy_prometheus_port }}':'{{ shinyproxy_prometheus_port }}'
+{% endif %}
 {% endif %}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock