diff --git a/proxy-server/src/main/java/io/micrometer/prometheus/rsocket/PrometheusController.java b/proxy-server/src/main/java/io/micrometer/prometheus/rsocket/PrometheusController.java
index b69bed4..fbdf53a 100644
--- a/proxy-server/src/main/java/io/micrometer/prometheus/rsocket/PrometheusController.java
+++ b/proxy-server/src/main/java/io/micrometer/prometheus/rsocket/PrometheusController.java
@@ -78,8 +78,11 @@ public PrometheusController(PrometheusMeterRegistry meterRegistry, PrometheusCon
         .tag("exception", "none")
         .publishPercentileHistogram()
         .register(meterRegistry);
-
-    this.scrapeTimerClosed = meterRegistry.timer("prometheus.proxy.scrape", "outcome", "closed", "exception", "none");
+    this.scrapeTimerClosed = Timer.builder("prometheus.proxy.scrape")
+        .tag("outcome", "closed")
+        .tag("exception", "none")
+        .publishPercentileHistogram()
+        .register(meterRegistry);
     this.scrapePayload = DistributionSummary.builder("prometheus.proxy.scrape.payload")
         .publishPercentileHistogram()
         .baseUnit("bytes")
@@ -173,9 +176,13 @@ public Mono<String> prometheus() {
                 if (throwable instanceof ClosedChannelException) {
                   sample.stop(scrapeTimerClosed);
                 } else {
-                  sample.stop(meterRegistry.timer("prometheus.proxy.scrape",
-                      "outcome", "error",
-                      "exception", throwable.getMessage()));
+                  sample.stop(
+                      Timer.builder("prometheus.proxy.scrape")
+                          .tag("outcome", "error")
+                          .tag("exception", throwable.getMessage())
+                          .publishPercentileHistogram()
+                          .register(meterRegistry)
+                  );
                 }
 
                 return connectionState.getDyingPush();