diff --git a/templates/Caddyfile.j2 b/templates/Caddyfile.j2
index 4c687ccc2..fb6f001ed 100644
--- a/templates/Caddyfile.j2
+++ b/templates/Caddyfile.j2
@@ -18,31 +18,31 @@ https://{{ matrix_server_fqn_matrix }} {
                 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 /metrics/synapse/worker/federation_sender-0
+                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 /metrics/synapse/worker/federation_sender-1
+                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 /metrics/synapse/worker/federation_sender-2
+                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 /metrics/synapse/worker/generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start)|int}}
+                uri replace /metrics/synapse/worker/generic-0 /metrics/synapse/worker/generic-worker-0
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/generic-1 {
-                uri replace /metrics/synapse/worker/generic-1 /metrics/synapse/worker/generic_worker-{{ (matrix_synapse_workers_generic_workers_port_range_start + 1)|int}}
+                uri replace /metrics/synapse/worker/generic-1 /metrics/synapse/worker/generic-worker-1
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/media-0 {
-                uri replace /metrics/synapse/worker/media-0 /metrics/synapse/worker/media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start)|int }}
+                uri replace /metrics/synapse/worker/media-0 /metrics/synapse/worker/media-repository-0
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/synapse/worker/media-1 {
-                uri replace /metrics/synapse/worker/media-1 /metrics/synapse/worker/media_repository-{{ (matrix_synapse_workers_media_repository_workers_port_range_start + 1)|int }}
+                uri replace /metrics/synapse/worker/media-1 /metrics/synapse/worker/media-repository-1
                 reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
         }
         route /metrics/bridge/* {