diff --git a/inventory/host_vars/matrix.finallycoffee.eu/vars.yml b/inventory/host_vars/matrix.finallycoffee.eu/vars.yml
index 60dd05eba..45bdb4f4a 100644
--- a/inventory/host_vars/matrix.finallycoffee.eu/vars.yml
+++ b/inventory/host_vars/matrix.finallycoffee.eu/vars.yml
@@ -12,7 +12,10 @@ matrix_nginx_proxy_container_federation_host_bind_port: "127.0.10.1:8448"
 matrix_nginx_proxy_trust_forwarded_proto: true
 matrix_nginx_proxy_x_forwarded_for: '$proxy_add_x_forwarded_for'
 
-matrix_nginx_proxy_proxy_synapse_metrics: true
+#matrix_nginx_proxy_proxy_synapse_metrics: true
+matrix_nginx_proxy_proxy_matrix_metrics_enabled: true
+matrix_synapse_metrics_enabled: true
+matrix_synapse_metrics_proxying_enabled: true
 
 matrix_base_data_path: "{{ vault_matrix_base_data_path }}"
 matrix_server_fqn_element: "chat.{{ matrix_domain }}"
@@ -245,18 +248,18 @@ matrix_mx_puppet_instagram_configuration_extension_yaml: |
 #
 # mx-puppet-skype configuration
 #
-matrix_mx_puppet_skype_enabled: true
+#matrix_mx_puppet_skype_enabled: false
 matrix_mx_puppet_skype_container_http_monitoring_host_bind_port: 9405
-matrix_mx_puppet_skype_container_extra_arguments:
-  - "-p 127.0.0.1:{{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}:{{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}"
-matrix_mx_puppet_skype_configuration_extension_yaml: |
-    bridge:
-        enableGroupSync: true
-        avatarUrl: mxc://finallycoffee.eu/jjXDuFqtpFOBOnywoHgzTuYt
-    metrics:
-        enabled: true
-        port: {{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}
-        path: /metrics
+# matrix_mx_puppet_skype_container_extra_arguments:
+#   - "-p 127.0.0.1:{{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}:{{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}"
+# matrix_mx_puppet_skype_configuration_extension_yaml: |
+#     bridge:
+#         enableGroupSync: true
+#         avatarUrl: mxc://finallycoffee.eu/jjXDuFqtpFOBOnywoHgzTuYt
+#     metrics:
+#         enabled: true
+#         port: {{ matrix_mx_puppet_skype_container_http_monitoring_host_bind_port }}
+#         path: /metrics
 
 
 #
diff --git a/templates/Caddyfile.j2 b/templates/Caddyfile.j2
index c09504a7a..4c687ccc2 100644
--- a/templates/Caddyfile.j2
+++ b/templates/Caddyfile.j2
@@ -10,39 +10,39 @@ https://{{ matrix_server_fqn_matrix }} {
                 monitoring JDJhJDE0JGdQRlNHVFpSQmRiaWlPem9LdXlkS09HN2E3LklZS05YZmtXTEY1NlFXbkMxd3hBUmwwbVZl
         }
         route /metrics/synapse {
-                uri replace /metrics/synapse /_synapse/metrics
+                uri replace /metrics/synapse /metrics/synapse/main-process
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/appservice {
-                uri replace /metrics/synapse/worker/appservice /_synapse-worker-appservice-0/metrics
+                uri replace /metrics/synapse/worker/appservice /metrics/synapse/worker/appservice-0
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/federation-sender-0 {
-                uri replace /metrics/synapse/worker/federation-sender-0 /_synapse-worker-federation_sender-0/metrics
+                uri replace /metrics/synapse/worker/federation-sender-0 /metrics/synapse/worker/federation_sender-0
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/federation-sender-1 {
-                uri replace /metrics/synapse/worker/federation-sender-1 /_synapse-worker-federation_sender-1/metrics
+                uri replace /metrics/synapse/worker/federation-sender-1 /metrics/synapse/worker/federation_sender-1
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/federation-sender-2 {
-                uri replace /metrics/synapse/worker/federation-sender-2 /_synapse-worker-federation_sender-2/metrics
+                uri replace /metrics/synapse/worker/federation-sender-2 /metrics/synapse/worker/federation_sender-2
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/generic-0 {
-                uri replace /metrics/synapse/worker/generic-0 /_synapse-worker-generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start)|int}}/metrics
+                uri replace /metrics/synapse/worker/generic-0 /metrics/synapse/worker/generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start)|int}}
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/generic-1 {
-                uri replace /metrics/synapse/worker/generic-1 /_synapse-worker-generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start + 1)|int}}/metrics
+                uri replace /metrics/synapse/worker/generic-1 /metrics/synapse/worker/generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start + 1)|int}}
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/media-0 {
-                uri replace /metrics/synapse/worker/media-0 /_synapse-worker-media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start)|int }}/metrics
+                uri replace /metrics/synapse/worker/media-0 /metrics/synapse/worker/media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start)|int }}
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/media-1 {
-                uri replace /metrics/synapse/worker/media-1 /_synapse-worker-media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start + 1)|int }}/metrics
+                uri replace /metrics/synapse/worker/media-1 /metrics/synapse/worker/media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start + 1)|int }}
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/bridge/* {