diff --git a/pom.xml b/pom.xml
index ce0801851d6..00bd94e8d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,8 @@
         <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
         <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
 
-        <quarkus.version>3.15.1</quarkus.version>
-        <quarkus.build.version>3.15.1</quarkus.build.version>
+        <quarkus.version>3.15.2</quarkus.version>
+        <quarkus.build.version>3.15.2</quarkus.build.version>
 
         <project.build-time>${timestamp}</project.build-time>
 
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index 65746777799..b561e444e28 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -43,34 +43,6 @@
         <module>tests</module>
     </modules>
 
-    <!-- Remove once Quarkus Micrometer extension uses Micrometer 1.13.5-->
-    <!-- See https://github.com/keycloak/keycloak/issues/33469 -->
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-core</artifactId>
-                <version>1.13.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-commons</artifactId>
-                <version>1.13.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-observation</artifactId>
-                <version>1.13.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
-                <version>1.13.5</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <!-- Remove until here  -->
-
     <repositories>
         <repository>
             <id>central</id>
diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java
index 50b9144eff6..07bb76552cd 100644
--- a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java
+++ b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java
@@ -16,6 +16,9 @@
  */
 package org.keycloak.services.resources.account;
 
+import jakarta.ws.rs.OPTIONS;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.jboss.logging.Logger;
 import org.keycloak.http.HttpRequest;
 import org.keycloak.http.HttpResponse;
@@ -96,6 +99,16 @@ public class AccountLoader {
         }
     }
 
+    // Remove once Quarkus is upgraded to 3.15.3, or reconsidered to use this approach
+    // See https://github.com/keycloak/keycloak/issues/36009
+    @OPTIONS
+    @Path("{any:.*}")
+    @Operation(hidden = true)
+    public Response preFlight() {
+        return new CorsPreflightService().preflight();
+    }
+    // remove until here
+
     @Path("{version : v\\d[0-9a-zA-Z_\\-]*}")
     @Produces(MediaType.APPLICATION_JSON)
     public Object getVersionedAccountRestService(final @PathParam("version") String version) {
diff --git a/tests/base/src/test/java/org/keycloak/test/admin/AdminPreflightTest.java b/tests/base/src/test/java/org/keycloak/test/admin/AdminPreflightTest.java
index 1906f14fe5a..e72226f4048 100644
--- a/tests/base/src/test/java/org/keycloak/test/admin/AdminPreflightTest.java
+++ b/tests/base/src/test/java/org/keycloak/test/admin/AdminPreflightTest.java
@@ -26,7 +26,16 @@ public class AdminPreflightTest {
 
     @Test
     public void testPreflight() throws IOException {
-        HttpOptions options = new HttpOptions(keycloakUrls.getAdminBuilder().path("/realms/master/users").build());
+        testPreflightForAdminPath("/realms/master/users");
+    }
+
+    @Test
+    public void testPreflightServerInfo() throws IOException {
+        testPreflightForAdminPath("/serverinfo");
+    }
+
+    private void testPreflightForAdminPath(String path) throws IOException {
+        HttpOptions options = new HttpOptions(keycloakUrls.getAdminBuilder().path(path).build());
         options.setHeader("Origin", "http://test");
 
         HttpResponse response = client.execute(options);