diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
index 578178661..4b7d5484b 100644
--- a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
+++ b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.24</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
index 99ba1084c..ed47d3787 100644
--- a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
+++ b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new GreetingServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
index 5022bc327..d1f01b17f 100644
--- a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
+++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.24</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
index 25ea8a1c6..b3e83cb7d 100644
--- a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
+++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml
index 197676b31..c7a2b1e4d 100644
--- a/examples/example-exporter-servlet-tomcat/pom.xml
+++ b/examples/example-exporter-servlet-tomcat/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.24</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
diff --git a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
index 81bc2ac19..2348cea9d 100644
--- a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
+++ b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
@@ -24,10 +24,10 @@ public static void main(String[] args) throws LifecycleException, IOException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
index 1d56f2bb8..7e9d9ab7d 100644
--- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.24</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
index fa470b306..3cfd603c0 100644
--- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
+++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
@@ -78,7 +78,7 @@ private static void run(Mode mode, int port) throws IOException, LifecycleExcept
     tomcat.setBaseDir(tmpDir.toFile().getAbsolutePath());
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();