diff --git a/docs/core-properties.html b/docs/core-properties.html
index b5577ab..78e7b21 100644
--- a/docs/core-properties.html
+++ b/docs/core-properties.html
@@ -231,7 +231,7 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.use-management-port</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui on the actuator management port.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui/scalar on the actuator management port.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.disable-i18n</p></td>
@@ -333,7 +333,7 @@
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-04-21 22:29:56 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/demos.html b/docs/demos.html
index b1248aa..4bad0db 100644
--- a/docs/demos.html
+++ b/docs/demos.html
@@ -37,10 +37,16 @@ <h3 id="_springdoc_applications_demos"><a class="anchor" href="#_springdoc_appli
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webmvc" target="_blank" rel="noopener">Demo Spring Boot 3 Web MVC with OpenAPI 3</a></p>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webmvc" target="_blank" rel="noopener">Demo Spring Boot 3 Web MVC with OpenAPI 3 and Swagger-UI</a></p>
 </li>
 <li>
-<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3</a></p>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3 and Swagger-UI</a></p>
+</li>
+<li>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-webmvc-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 3  Web MVC with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-webflux-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3 and Scalar</a></p>
 </li>
 <li>
 <p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux-functional/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with Functional endpoints OpenAPI 3</a></p>
@@ -91,7 +97,7 @@ <h3 id="_source_code_of_the_demo_applications"><a class="anchor" href="#_source_
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-22 21:24:52 +0200
+Last updated 2025-09-07 15:07:54 +0200
 </div>
 </div>
 </div>
diff --git a/docs/faq.html b/docs/faq.html
index 042567c..8c5dcf2 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -337,14 +337,8 @@ <h3 id="_how_can_i_ignore_authenticationprincipal_parameter_from_spring_security
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </li>
@@ -2010,7 +2004,7 @@ <h3 id="_what_is_the_compatibility_matrix_of_springdoc_openapi_with_spring_boot"
 <p><code>springdoc-openapi 2.x</code> is compatible with <code>spring-boot 3</code>.</p>
 </div>
 <div class="paragraph">
-<p>In general, <strong>you should only pick the last stable version as per today 2.8.11.</strong></p>
+<p>In general, <strong>you should only pick the last stable version as per today 2.8.14.</strong></p>
 </div>
 <div class="paragraph">
 <p>More precisely, this the exhaustive list of spring-boot versions against which <code>springdoc-openapi</code> has been built:</p>
@@ -2129,7 +2123,7 @@ <h3 id="_some_parameters_are_not_generated_in_the_resulting_openapi_spec"><a cla
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-20 18:06:19 +0200
+Last updated 2025-09-07 14:59:24 +0200
 </div>
 </div>
 </div>
diff --git a/docs/features.html b/docs/features.html
index dfa5983..0d7e077 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -143,19 +143,19 @@ <h3 id="_spring_webfluxwebmvc_fn_with_functional_endpoints"><a class="anchor" hr
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/blob/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app90/HelloRouter.java">HelloRouter</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/blob/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/HelloRouter.java">HelloRouter</a></p>
 </li>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/blob/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app90/quotes/QuotesRouter.java">QuotesRouter</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/blob/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/quotes/QuotesRouter.java">QuotesRouter</a></p>
 </li>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/blob/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app90/book/BookRouter.java">BookRouter</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/blob/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/book/BookRouter.java">BookRouter</a></p>
 </li>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/blob/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app90/employee/EmployeeRouter.java">EmployeeRouter</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/blob/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRouter.java">EmployeeRouter</a></p>
 </li>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/blob/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/app90/position/PositionRouter.java">PositionRouter</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/blob/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/position/PositionRouter.java">PositionRouter</a></p>
 </li>
 </ul>
 </div>
@@ -312,7 +312,7 @@ <h3 id="_spring_webfluxwebmvc_fn_with_functional_endpoints"><a class="anchor" hr
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://github.com/springdoc/springdoc-openapi/tree/master/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api" target="_blank" rel="noopener">Sample code with Functional Endpoints documentation</a></p>
+<p><a href="https://github.com/springdoc/springdoc-openapi/tree/main/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31" target="_blank" rel="noopener">Sample code with Functional Endpoints documentation</a></p>
 </li>
 </ul>
 </div>
@@ -359,4 +359,4 @@ <h3 id="_integration_with_wildfly"><a class="anchor" href="#_integration_with_wi
   </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 4c026c6..d3e6470 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -40,7 +40,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>Getting S
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -80,7 +80,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>Getting S
 <i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file: .
+For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file.
 </td>
 </tr>
 </table>
@@ -107,7 +107,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>Getting S
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-05-04 17:47:09 +0200
+Last updated 2025-09-07 17:05:02 +0200
 </div>
 </div>
 </div>
diff --git a/docs/index.html b/docs/index.html
index 767ebcb..afaa484 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -18,7 +18,7 @@
 <meta property="og:site_name" content="OpenAPI 3 Library for spring-boot" />
 <meta property="og:image" content="https://springdoc.org/img/banner-logo.svg" />
 <meta name="author" content="Library for OpenAPI 3 with spring-boot By Badr NASS LAHSEN">
-<title>springdoc-openapi v2.8.11</title>
+<title>springdoc-openapi v2.8.14</title>
 <link rel="stylesheet" href="css/site.css">
 <style>
     #header #revnumber {
@@ -55,7 +55,7 @@
   <div id="main" class="contained">
     <div id="doc" class="doc">
 <div id="header">
-<h1>springdoc-openapi v2.8.11</h1>
+<h1>springdoc-openapi v2.8.14</h1>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
 <ul class="sectlevel1">
@@ -66,15 +66,17 @@ <h1>springdoc-openapi v2.8.11</h1>
 <li><a href="#general-overview">3.1. General overview</a></li>
 <li><a href="#spring-webmvc-support">3.2. Spring WebMvc support</a></li>
 <li><a href="#spring-webflux-support">3.3. Spring WebFlux support</a></li>
-<li><a href="#spring-hateoas-support">3.4. Spring Hateoas support</a></li>
-<li><a href="#spring-data-rest-support">3.5. Spring Data Rest support</a></li>
-<li><a href="#spring-security-support">3.6. Spring Security support</a></li>
-<li><a href="#actuator-support">3.7. Actuator support</a></li>
-<li><a href="#spring-cloud-function-web-support">3.8. Spring Cloud Function Web support</a></li>
-<li><a href="#kotlin-support">3.9. Kotlin support</a></li>
-<li><a href="#groovy-support">3.10. Groovy support</a></li>
-<li><a href="#javadoc-support">3.11. Javadoc support</a></li>
-<li><a href="#springdoc-openapi-bom">3.12. Springdoc-openapi BOM</a></li>
+<li><a href="#swagger-ui-support">3.4. Swagger-UI support</a></li>
+<li><a href="#scalar-support">3.5. Scalar support</a></li>
+<li><a href="#spring-hateoas-support">3.6. Spring Hateoas support</a></li>
+<li><a href="#spring-data-rest-support">3.7. Spring Data Rest support</a></li>
+<li><a href="#spring-security-support">3.8. Spring Security support</a></li>
+<li><a href="#actuator-support">3.9. Actuator support</a></li>
+<li><a href="#spring-cloud-function-web-support">3.10. Spring Cloud Function Web support</a></li>
+<li><a href="#kotlin-support">3.11. Kotlin support</a></li>
+<li><a href="#groovy-support">3.12. Groovy support</a></li>
+<li><a href="#javadoc-support">3.13. Javadoc support</a></li>
+<li><a href="#springdoc-openapi-bom">3.14. Springdoc-openapi BOM</a></li>
 </ul>
 </li>
 <li><a href="#features">4. Springdoc-openapi Features</a>
@@ -285,6 +287,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>1. Introduction
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -316,7 +321,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>2. Gettin
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -356,7 +361,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>2. Gettin
 <i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file: .
+For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file.
 </td>
 </tr>
 </table>
@@ -424,7 +429,7 @@ <h3 id="spring-webmvc-support"><a class="anchor" href="#spring-webmvc-support"><
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-api&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -435,7 +440,7 @@ <h3 id="spring-webmvc-support"><a class="anchor" href="#spring-webmvc-support"><
 <i class="fa icon-note" title="Note"></i>
 </td>
 <td class="content">
-This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui.
+This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui or Scalar.
 </td>
 </tr>
 </table>
@@ -476,13 +481,110 @@ <h3 id="spring-webflux-support"><a class="anchor" href="#spring-webflux-support"
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webflux-api&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="swagger-ui-support"><a class="anchor" href="#swagger-ui-support"></a>3.4. Swagger-UI support</h3>
+<div class="paragraph">
+<p><a href="https://swagger.io/tools/swagger-ui/">Swagger UI</a> allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"></a>3.4. Spring Hateoas support</h3>
+<h3 id="scalar-support"><a class="anchor" href="#scalar-support"></a>3.5. Scalar support</h3>
+<div class="paragraph">
+<p><a href="https://scalar.com/">Scalar</a> is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications.
+It’s particularly aimed at improving the developer experience when exploring APIs.</p>
+</div>
+<div class="paragraph">
+<p><code>springdoc-openapi</code> extends <code>Scalar</code> configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix <code>scalar</code>, as explained in the <a href="https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties">Scalar documentation</a>.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The Swagger UI page will then be available at <code>http://server:port/context-path/scalar</code> and the OpenAPI description will be available at the following url for json format: <code>http://server:port/context-path/v3/api-docs</code></p>
+<div class="ulist">
+<ul>
+<li>
+<p>server: The server name or IP</p>
+</li>
+<li>
+<p>port: The server port</p>
+</li>
+<li>
+<p>context-path: The context path of the application</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webflux-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"></a>3.6. Spring Hateoas support</h3>
 <div class="paragraph">
 <p>The support for Spring Hateoas is available using the dependency springdoc-openapi-hateoas.</p>
 </div>
@@ -501,7 +603,7 @@ <h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-support"></a>3.5. Spring Data Rest support</h3>
+<h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-support"></a>3.7. Spring Data Rest support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> project supports <code>spring-boot-starter-data-rest</code> types like: <code>@RepositoryRestResource</code> and <code>QuerydslPredicate</code> annotations.</p>
 </div>
@@ -520,7 +622,7 @@ <h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-supp
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-security-support"><a class="anchor" href="#spring-security-support"></a>3.6. Spring Security support</h3>
+<h3 id="spring-security-support"><a class="anchor" href="#spring-security-support"></a>3.8. Spring Security support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> helps ignoring @AuthenticationPrincipal type in case it is used on REST Controllers.</p>
 </div>
@@ -536,19 +638,13 @@ <h3 id="spring-security-support"><a class="anchor" href="#spring-security-suppor
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Actuator support</h3>
+<h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.9. Actuator support</h3>
 <div class="ulist">
 <ul>
 <li>
@@ -577,13 +673,15 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </table>
 </div>
 <div class="paragraph">
-<p>To expose the swagger-ui, on the management port, you should set</p>
+<p>To expose the swagger-ui and Scalar, on the management port, you should set</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-properties" data-lang="properties">springdoc.use-management-port=true
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
-management.endpoints.web.exposure.include=openapi, swagger-ui</code></pre>
+management.endpoints.web.exposure.include=openapi, swagger-ui
+# This property enables the openapi and scalar endpoints to be exposed beneath the actuator base path.
+management.endpoints.web.exposure.include=openapi, scalar</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -594,7 +692,7 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 <p>For example, if you have the following settings:</p>
 </div>
 <div class="paragraph">
-<p>Two endpoints will be available:</p>
+<p>These endpoints will be available:</p>
 </div>
 <div class="olist arabic">
 <ol class="arabic">
@@ -618,6 +716,16 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </ul>
 </div>
 </li>
+<li>
+<p>Or An Endpoint, that routes to the scalar:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>http://serverName:managementPort/actuator/scalar</code></p>
+</li>
+</ul>
+</div>
+</li>
 </ol>
 </div>
 <div class="listingblock">
@@ -626,7 +734,7 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </div>
 </div>
 <div class="paragraph">
-<p>For the example, you should also be able to see the springdoc-openapi endpoints:</p>
+<p>For the example, you should also be able to see the springdoc-openapi endpoints depending on the chosen UI:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -634,7 +742,7 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 <p><code>http://serverName:9090/actuator</code></p>
 </li>
 <li>
-<p><code>http://serverName:9090/actuator/swagger-ui</code></p>
+<p><code>http://serverName:9090/actuator/swagger-ui</code> or <code>http://serverName:9090/actuator/scalar</code></p>
 </li>
 <li>
 <p><code>http://serverName:9090/actuator/openapi</code></p>
@@ -651,13 +759,13 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 <i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-If you want to reach the application endpoints, from the swagger-ui deployed beneath the actuator base path, using a different port from your application, <code>CORS for your endpoints</code> on your application level should be enabled.
+If you want to reach the application endpoints, from the swagger-ui/scalar deployed beneath the actuator base path, using a different port from your application, <code>CORS for your endpoints</code> on your application level should be enabled.
 </td>
 </tr>
 </table>
 </div>
 <div class="paragraph">
-<p>Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui.</p>
+<p>Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui/scalar.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -680,6 +788,16 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </ul>
 </div>
 <div class="paragraph">
+<p>The scalar UI will be then accessible through the actuator port:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>http://serverName:managementPort/actuator/scalar</code></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
 <p>If the management port is different from the application port and <code>springdoc.use-management-port</code> is not defined but <code>springdoc.show-actuator</code> is set to true:</p>
 </div>
 <div class="ulist">
@@ -688,6 +806,9 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 <p>The swagger-ui will be then accessible through the application port. For example: <code>http://serverName:applicationPort/swagger-ui.html</code></p>
 </li>
 <li>
+<p>The scalar UI will be then accessible through the application port. For example: <code>http://serverName:applicationPort/scalar</code></p>
+</li>
+<li>
 <p>A dedicated group for the actuator endpoints will be by default added.</p>
 </li>
 <li>
@@ -712,7 +833,7 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud-function-web-support"></a>3.8. Spring Cloud Function Web support</h3>
+<h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud-function-web-support"></a>3.10. Spring Cloud Function Web support</h3>
 <div class="paragraph">
 <p><code>spring-cloud-function-web</code> exposes Java Function as REST endpoint automatically.
 * Since version <code>v1.6.3</code>, the support of functional endpoints has been added.</p>
@@ -724,10 +845,10 @@ <h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud
 <div class="ulist">
 <ul>
 <li>
-<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-ui</code> dependency.</p>
+<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-api</code> dependency.</p>
 </li>
 <li>
-<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-ui</code> dependency.</p>
+<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-api</code> dependency.</p>
 </li>
 </ul>
 </div>
@@ -807,7 +928,7 @@ <h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud
 </div>
 </div>
 <div class="sect2">
-<h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin support</h3>
+<h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.11. Kotlin support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> supports Kotlin types.</p>
 </div>
@@ -820,14 +941,8 @@ <h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -852,7 +967,7 @@ <h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin
 </div>
 </div>
 <div class="sect2">
-<h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.10. Groovy support</h3>
+<h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.12. Groovy support</h3>
 <div class="paragraph">
 <p>The projects that use <code>Groovy</code> should use:</p>
 </div>
@@ -862,19 +977,13 @@ <h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.10. Groov
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Javadoc support</h3>
+<h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.13. Javadoc support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> can introspect <code>Javadoc</code> annotations and comments:</p>
 </div>
@@ -900,14 +1009,8 @@ <h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Jav
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -966,7 +1069,7 @@ <h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Jav
 </div>
 </div>
 <div class="sect2">
-<h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"></a>3.12. Springdoc-openapi BOM</h3>
+<h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"></a>3.14. Springdoc-openapi BOM</h3>
 <div class="paragraph">
 <p>Starting from version <code>v2.8.7</code>, <code>springdoc-openapi</code> provides a BOM (Bill of Materials) to manage the dependencies of the project.
 You can declare it in your project as follows:</p>
@@ -978,7 +1081,7 @@ <h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"><
             &lt;dependency&gt;
                 &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
                 &lt;artifactId&gt;springdoc-openapi-bom&lt;/artifactId&gt;
-                &lt;version&gt;2.8.11&lt;/version&gt;
+                &lt;version&gt;2.8.14&lt;/version&gt;
                 &lt;type&gt;pom&lt;/type&gt;
                 &lt;scope&gt;import&lt;/scope&gt;
             &lt;/dependency&gt;
@@ -1519,7 +1622,7 @@ <h3 id="springdoc-openapi-core-properties"><a class="anchor" href="#springdoc-op
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.use-management-port</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui on the actuator management port.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui/scalar on the actuator management port.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.disable-i18n</p></td>
@@ -2011,10 +2114,16 @@ <h3 id="springdoc-applications-demos"><a class="anchor" href="#springdoc-applica
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webmvc" target="_blank" rel="noopener">Demo Spring Boot 3 Web MVC with OpenAPI 3</a></p>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webmvc" target="_blank" rel="noopener">Demo Spring Boot 3 Web MVC with OpenAPI 3 and Swagger-UI</a></p>
 </li>
 <li>
-<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3</a></p>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3 and Swagger-UI</a></p>
+</li>
+<li>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-webmvc-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 3  Web MVC with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
+<p><a href="https://demos.springdoc.org/demo-spring-boot-webflux-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with OpenAPI 3 and Scalar</a></p>
 </li>
 <li>
 <p><a href="https://demos.springdoc.org/demo-spring-boot-3-webflux-functional/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 3 WebFlux with Functional endpoints OpenAPI 3</a></p>
@@ -2267,7 +2376,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -2404,7 +2513,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <div class="ulist">
 <ul>
 <li>
-<p>If the swagger-ui is served behind a proxy:</p>
+<p>If the swagger-ui/scalar is served behind a proxy:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -2916,14 +3025,8 @@ <h3 id="how-can-i-ignore-authenticationprincipal-parameter-from-spring-security"
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </li>
@@ -4589,7 +4692,7 @@ <h3 id="what-is-the-compatibility-matrix-of-springdoc-openapi-with-spring-boot">
 <p><code>springdoc-openapi 2.x</code> is compatible with <code>spring-boot 3</code>.</p>
 </div>
 <div class="paragraph">
-<p>In general, <strong>you should only pick the last stable version as per today 2.8.11.</strong></p>
+<p>In general, <strong>you should only pick the last stable version as per today 2.8.14.</strong></p>
 </div>
 <div class="paragraph">
 <p>More precisely, this the exhaustive list of spring-boot versions against which <code>springdoc-openapi</code> has been built:</p>
diff --git a/docs/intro.html b/docs/intro.html
index 9181077..520c64f 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -58,6 +58,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -81,7 +84,7 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-06 14:24:00 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/migrating-from-springfox.html b/docs/migrating-from-springfox.html
index ec21316..9b95cf6 100644
--- a/docs/migrating-from-springfox.html
+++ b/docs/migrating-from-springfox.html
@@ -44,7 +44,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -181,7 +181,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <div class="ulist">
 <ul>
 <li>
-<p>If the swagger-ui is served behind a proxy:</p>
+<p>If the swagger-ui/scalar is served behind a proxy:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -217,7 +217,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-06 14:24:00 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/modules.html b/docs/modules.html
index d560fc4..937b2b7 100644
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -73,7 +73,7 @@ <h3 id="_spring_webmvc_support"><a class="anchor" href="#_spring_webmvc_support"
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-api&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -84,7 +84,7 @@ <h3 id="_spring_webmvc_support"><a class="anchor" href="#_spring_webmvc_support"
 <i class="fa icon-note" title="Note"></i>
 </td>
 <td class="content">
-This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui.
+This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui or Scalar.
 </td>
 </tr>
 </table>
@@ -125,7 +125,104 @@ <h3 id="_spring_webflux_support"><a class="anchor" href="#_spring_webflux_suppor
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webflux-api&lt;/artifactId&gt;
-      &lt;version&gt;2.8.11&lt;/version&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_swagger_ui_support"><a class="anchor" href="#_swagger_ui_support"></a>Swagger-UI support</h3>
+<div class="paragraph">
+<p><a href="https://swagger.io/tools/swagger-ui/">Swagger UI</a> allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_scalar_support"><a class="anchor" href="#_scalar_support"></a>Scalar support</h3>
+<div class="paragraph">
+<p><a href="https://scalar.com/">Scalar</a> is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications.
+It’s particularly aimed at improving the developer experience when exploring APIs.</p>
+</div>
+<div class="paragraph">
+<p><code>springdoc-openapi</code> extends <code>Scalar</code> configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix <code>scalar</code>, as explained in the <a href="https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties">Scalar documentation</a>.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The Swagger UI page will then be available at <code>http://server:port/context-path/scalar</code> and the OpenAPI description will be available at the following url for json format: <code>http://server:port/context-path/v3/api-docs</code></p>
+<div class="ulist">
+<ul>
+<li>
+<p>server: The server name or IP</p>
+</li>
+<li>
+<p>port: The server port</p>
+</li>
+<li>
+<p>context-path: The context path of the application</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webflux-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -185,14 +282,8 @@ <h3 id="_spring_security_support"><a class="anchor" href="#_spring_security_supp
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
@@ -226,13 +317,15 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 </table>
 </div>
 <div class="paragraph">
-<p>To expose the swagger-ui, on the management port, you should set</p>
+<p>To expose the swagger-ui and Scalar, on the management port, you should set</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code class="language-properties" data-lang="properties">springdoc.use-management-port=true
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
-management.endpoints.web.exposure.include=openapi, swagger-ui</code></pre>
+management.endpoints.web.exposure.include=openapi, swagger-ui
+# This property enables the openapi and scalar endpoints to be exposed beneath the actuator base path.
+management.endpoints.web.exposure.include=openapi, scalar</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -243,7 +336,7 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 <p>For example, if you have the following settings:</p>
 </div>
 <div class="paragraph">
-<p>Two endpoints will be available:</p>
+<p>These endpoints will be available:</p>
 </div>
 <div class="olist arabic">
 <ol class="arabic">
@@ -267,6 +360,16 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 </ul>
 </div>
 </li>
+<li>
+<p>Or An Endpoint, that routes to the scalar:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>http://serverName:managementPort/actuator/scalar</code></p>
+</li>
+</ul>
+</div>
+</li>
 </ol>
 </div>
 <div class="listingblock">
@@ -275,7 +378,7 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 </div>
 </div>
 <div class="paragraph">
-<p>For the example, you should also be able to see the springdoc-openapi endpoints:</p>
+<p>For the example, you should also be able to see the springdoc-openapi endpoints depending on the chosen UI:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -283,7 +386,7 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 <p><code>http://serverName:9090/actuator</code></p>
 </li>
 <li>
-<p><code>http://serverName:9090/actuator/swagger-ui</code></p>
+<p><code>http://serverName:9090/actuator/swagger-ui</code> or <code>http://serverName:9090/actuator/scalar</code></p>
 </li>
 <li>
 <p><code>http://serverName:9090/actuator/openapi</code></p>
@@ -300,13 +403,13 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 <i class="fa icon-tip" title="Tip"></i>
 </td>
 <td class="content">
-If you want to reach the application endpoints, from the swagger-ui deployed beneath the actuator base path, using a different port from your application, <code>CORS for your endpoints</code> on your application level should be enabled.
+If you want to reach the application endpoints, from the swagger-ui/scalar deployed beneath the actuator base path, using a different port from your application, <code>CORS for your endpoints</code> on your application level should be enabled.
 </td>
 </tr>
 </table>
 </div>
 <div class="paragraph">
-<p>Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui.</p>
+<p>Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui/scalar.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -329,6 +432,16 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 </ul>
 </div>
 <div class="paragraph">
+<p>The scalar UI will be then accessible through the actuator port:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>http://serverName:managementPort/actuator/scalar</code></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
 <p>If the management port is different from the application port and <code>springdoc.use-management-port</code> is not defined but <code>springdoc.show-actuator</code> is set to true:</p>
 </div>
 <div class="ulist">
@@ -337,6 +450,9 @@ <h3 id="_actuator_support"><a class="anchor" href="#_actuator_support"></a>Actua
 <p>The swagger-ui will be then accessible through the application port. For example: <code>http://serverName:applicationPort/swagger-ui.html</code></p>
 </li>
 <li>
+<p>The scalar UI will be then accessible through the application port. For example: <code>http://serverName:applicationPort/scalar</code></p>
+</li>
+<li>
 <p>A dedicated group for the actuator endpoints will be by default added.</p>
 </li>
 <li>
@@ -373,10 +489,10 @@ <h3 id="_spring_cloud_function_web_support"><a class="anchor" href="#_spring_clo
 <div class="ulist">
 <ul>
 <li>
-<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-ui</code> dependency.</p>
+<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-api</code> dependency.</p>
 </li>
 <li>
-<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-ui</code> dependency.</p>
+<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-api</code> dependency.</p>
 </li>
 </ul>
 </div>
@@ -469,14 +585,8 @@ <h3 id="_kotlin_support"><a class="anchor" href="#_kotlin_support"></a>Kotlin su
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -511,14 +621,8 @@ <h3 id="_groovy_support"><a class="anchor" href="#_groovy_support"></a>Groovy su
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
@@ -549,14 +653,8 @@ <h3 id="_javadoc_support"><a class="anchor" href="#_javadoc_support"></a>Javadoc
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -627,7 +725,7 @@ <h3 id="_springdoc_openapi_bom"><a class="anchor" href="#_springdoc_openapi_bom"
 			&lt;dependency&gt;
 				&lt;groupId&gt;org.springdoc&lt;/groupId&gt;
 				&lt;artifactId&gt;springdoc-openapi-bom&lt;/artifactId&gt;
-                &lt;version&gt;2.8.11&lt;/version&gt;
+                &lt;version&gt;2.8.14&lt;/version&gt;
 				&lt;type&gt;pom&lt;/type&gt;
 				&lt;scope&gt;import&lt;/scope&gt;
 			&lt;/dependency&gt;
@@ -641,7 +739,7 @@ <h3 id="_springdoc_openapi_bom"><a class="anchor" href="#_springdoc_openapi_bom"
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-05-04 17:47:09 +0200
+Last updated 2025-09-07 17:07:48 +0200
 </div>
 </div>
 </div>
diff --git a/docs/properties.html b/docs/properties.html
index 8389073..cb6014b 100644
--- a/docs/properties.html
+++ b/docs/properties.html
@@ -239,7 +239,7 @@ <h3 id="_springdoc_openapi_core_properties"><a class="anchor" href="#_springdoc_
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.use-management-port</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui on the actuator management port.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui/scalar on the actuator management port.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.disable-i18n</p></td>
diff --git a/docs/v1/index.html b/docs/v1/index.html
index 455ec00..385b3f4 100644
--- a/docs/v1/index.html
+++ b/docs/v1/index.html
@@ -263,6 +263,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>1. Introduction
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -2037,7 +2040,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <div class="ulist">
 <ul>
 <li>
-<p>If the swagger-ui is served behind a proxy:</p>
+<p>If the swagger-ui/scalar is served behind a proxy:</p>
 <div class="ulist">
 <ul>
 <li>
diff --git a/docs/v1/intro.html b/docs/v1/intro.html
index 5f657ae..143a00e 100644
--- a/docs/v1/intro.html
+++ b/docs/v1/intro.html
@@ -58,6 +58,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -81,7 +84,7 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-06 14:24:00 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v1/migrating-from-springfox.html b/docs/v1/migrating-from-springfox.html
index c9ae792..a15e0e2 100644
--- a/docs/v1/migrating-from-springfox.html
+++ b/docs/v1/migrating-from-springfox.html
@@ -184,7 +184,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <div class="ulist">
 <ul>
 <li>
-<p>If the swagger-ui is served behind a proxy:</p>
+<p>If the swagger-ui/scalar is served behind a proxy:</p>
 <div class="ulist">
 <ul>
 <li>
@@ -220,7 +220,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-06 14:24:00 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v1/properties.html b/docs/v1/properties.html
index 27ff29f..8a0bb16 100644
--- a/docs/v1/properties.html
+++ b/docs/v1/properties.html
@@ -239,7 +239,7 @@ <h3 id="_springdoc_openapi_core_properties"><a class="anchor" href="#_springdoc_
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.use-management-port</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui on the actuator management port.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui/scalar on the actuator management port.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.disable-i18n</p></td>
diff --git a/docs/v4/demos.html b/docs/v4/demos.html
index e33029d..f282cc2 100644
--- a/docs/v4/demos.html
+++ b/docs/v4/demos.html
@@ -43,6 +43,12 @@ <h3 id="_springdoc_applications_demos"><a class="anchor" href="#_springdoc_appli
 <p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with OpenAPI 3</a></p>
 </li>
 <li>
+<p><a href="https://demos1.springdoc.org/demo-spring-boot-webmvc-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 4  Web MVC with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
+<p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
 <p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux-functional/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with Functional endpoints OpenAPI 3</a></p>
 </li>
 <li>
@@ -91,7 +97,7 @@ <h3 id="_source_code_of_the_demo_applications"><a class="anchor" href="#_source_
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-22 21:04:37 +0200
+Last updated 2025-09-07 15:08:33 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v4/faq.html b/docs/v4/faq.html
index bf7b21f..d8eb551 100644
--- a/docs/v4/faq.html
+++ b/docs/v4/faq.html
@@ -337,14 +337,8 @@ <h3 id="_how_can_i_ignore_authenticationprincipal_parameter_from_spring_security
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </li>
@@ -2010,7 +2004,7 @@ <h3 id="_what_is_the_compatibility_matrix_of_springdoc_openapi_with_spring_boot"
 <p><code>springdoc-openapi 3.x</code> is compatible with <code>spring-boot 4</code>.</p>
 </div>
 <div class="paragraph">
-<p>In general, <strong>you should only pick the last stable version as per today 3.0.0-M1.</strong></p>
+<p>In general, <strong>you should only pick the last stable version as per today 3.0.0.</strong></p>
 </div>
 <div class="paragraph">
 <p>More precisely, this the exhaustive list of spring-boot versions against which <code>springdoc-openapi</code> has been built:</p>
@@ -2081,7 +2075,7 @@ <h3 id="_some_parameters_are_not_generated_in_the_resulting_openapi_spec"><a cla
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-22 13:22:49 +0200
+Last updated 2025-09-07 14:59:24 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v4/getting-started.html b/docs/v4/getting-started.html
index ba6611a..6ac4761 100644
--- a/docs/v4/getting-started.html
+++ b/docs/v4/getting-started.html
@@ -40,7 +40,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>Getting S
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
diff --git a/docs/v4/index.html b/docs/v4/index.html
index e0fbc7f..916d842 100644
--- a/docs/v4/index.html
+++ b/docs/v4/index.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="generator" content="Asciidoctor 2.0.15">
-<title>springdoc-openapi v3.0.0-M1</title>
+<title>springdoc-openapi v3.0.0</title>
 <link rel="stylesheet" href="css/site.css">
 <style>
     #header #revnumber {
@@ -42,7 +42,7 @@
   <div id="main" class="contained">
     <div id="doc" class="doc">
 <div id="header">
-<h1>springdoc-openapi v3.0.0-M1</h1>
+<h1>springdoc-openapi v3.0.0</h1>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
 <ul class="sectlevel1">
@@ -53,15 +53,17 @@ <h1>springdoc-openapi v3.0.0-M1</h1>
 <li><a href="#general-overview">3.1. General overview</a></li>
 <li><a href="#spring-webmvc-support">3.2. Spring WebMvc support</a></li>
 <li><a href="#spring-webflux-support">3.3. Spring WebFlux support</a></li>
-<li><a href="#spring-hateoas-support">3.4. Spring Hateoas support</a></li>
-<li><a href="#spring-data-rest-support">3.5. Spring Data Rest support</a></li>
-<li><a href="#spring-security-support">3.6. Spring Security support</a></li>
-<li><a href="#actuator-support">3.7. Actuator support</a></li>
-<li><a href="#spring-cloud-function-web-support">3.8. Spring Cloud Function Web support</a></li>
-<li><a href="#kotlin-support">3.9. Kotlin support</a></li>
-<li><a href="#groovy-support">3.10. Groovy support</a></li>
-<li><a href="#javadoc-support">3.11. Javadoc support</a></li>
-<li><a href="#springdoc-openapi-bom">3.12. Springdoc-openapi BOM</a></li>
+<li><a href="#swagger-ui-support">3.4. Swagger-UI support</a></li>
+<li><a href="#scalar-support">3.5. Scalar support</a></li>
+<li><a href="#spring-hateoas-support">3.6. Spring Hateoas support</a></li>
+<li><a href="#spring-data-rest-support">3.7. Spring Data Rest support</a></li>
+<li><a href="#spring-security-support">3.8. Spring Security support</a></li>
+<li><a href="#actuator-support">3.9. Actuator support</a></li>
+<li><a href="#spring-cloud-function-web-support">3.10. Spring Cloud Function Web support</a></li>
+<li><a href="#kotlin-support">3.11. Kotlin support</a></li>
+<li><a href="#groovy-support">3.12. Groovy support</a></li>
+<li><a href="#javadoc-support">3.13. Javadoc support</a></li>
+<li><a href="#springdoc-openapi-bom">3.14. Springdoc-openapi BOM</a></li>
 </ul>
 </li>
 <li><a href="#features">4. Springdoc-openapi Features</a>
@@ -257,6 +259,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>1. Introduction
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -288,7 +293,7 @@ <h2 id="getting-started"><a class="anchor" href="#getting-started"></a>2. Gettin
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -396,7 +401,7 @@ <h3 id="spring-webmvc-support"><a class="anchor" href="#spring-webmvc-support"><
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-api&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -448,13 +453,110 @@ <h3 id="spring-webflux-support"><a class="anchor" href="#spring-webflux-support"
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webflux-api&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"></a>3.4. Spring Hateoas support</h3>
+<h3 id="swagger-ui-support"><a class="anchor" href="#swagger-ui-support"></a>3.4. Swagger-UI support</h3>
+<div class="paragraph">
+<p><a href="https://swagger.io/tools/swagger-ui/">Swagger UI</a> allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="scalar-support"><a class="anchor" href="#scalar-support"></a>3.5. Scalar support</h3>
+<div class="paragraph">
+<p><a href="https://scalar.com/">Scalar</a> is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications.
+It’s particularly aimed at improving the developer experience when exploring APIs.</p>
+</div>
+<div class="paragraph">
+<p><code>springdoc-openapi</code> extends <code>Scalar</code> configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix <code>scalar</code>, as explained in the <a href="https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties">Scalar documentation</a>.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The Swagger UI page will then be available at <code>http://server:port/context-path/scalar</code> and the OpenAPI description will be available at the following url for json format: <code>http://server:port/context-path/v3/api-docs</code></p>
+<div class="ulist">
+<ul>
+<li>
+<p>server: The server name or IP</p>
+</li>
+<li>
+<p>port: The server port</p>
+</li>
+<li>
+<p>context-path: The context path of the application</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webflux-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"></a>3.6. Spring Hateoas support</h3>
 <div class="paragraph">
 <p>The support for Spring Hateoas is available using the dependency springdoc-openapi-hateoas.</p>
 </div>
@@ -473,7 +575,7 @@ <h3 id="spring-hateoas-support"><a class="anchor" href="#spring-hateoas-support"
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-support"></a>3.5. Spring Data Rest support</h3>
+<h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-support"></a>3.7. Spring Data Rest support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> project supports <code>spring-boot-starter-data-rest</code> types like: <code>@RepositoryRestResource</code> and <code>QuerydslPredicate</code> annotations.</p>
 </div>
@@ -492,7 +594,7 @@ <h3 id="spring-data-rest-support"><a class="anchor" href="#spring-data-rest-supp
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-security-support"><a class="anchor" href="#spring-security-support"></a>3.6. Spring Security support</h3>
+<h3 id="spring-security-support"><a class="anchor" href="#spring-security-support"></a>3.8. Spring Security support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> helps ignoring @AuthenticationPrincipal type in case it is used on REST Controllers.</p>
 </div>
@@ -508,19 +610,13 @@ <h3 id="spring-security-support"><a class="anchor" href="#spring-security-suppor
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Actuator support</h3>
+<h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.9. Actuator support</h3>
 <div class="ulist">
 <ul>
 <li>
@@ -684,7 +780,7 @@ <h3 id="actuator-support"><a class="anchor" href="#actuator-support"></a>3.7. Ac
 </div>
 </div>
 <div class="sect2">
-<h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud-function-web-support"></a>3.8. Spring Cloud Function Web support</h3>
+<h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud-function-web-support"></a>3.10. Spring Cloud Function Web support</h3>
 <div class="paragraph">
 <p><code>spring-cloud-function-web</code> exposes Java Function as REST endpoint automatically.
 * Since version <code>v1.6.3</code>, the support of functional endpoints has been added.</p>
@@ -696,10 +792,10 @@ <h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud
 <div class="ulist">
 <ul>
 <li>
-<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-ui</code> dependency.</p>
+<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-api</code> dependency.</p>
 </li>
 <li>
-<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-ui</code> dependency.</p>
+<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-api</code> dependency.</p>
 </li>
 </ul>
 </div>
@@ -779,7 +875,7 @@ <h3 id="spring-cloud-function-web-support"><a class="anchor" href="#spring-cloud
 </div>
 </div>
 <div class="sect2">
-<h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin support</h3>
+<h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.11. Kotlin support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> supports Kotlin types.</p>
 </div>
@@ -792,14 +888,8 @@ <h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -824,7 +914,7 @@ <h3 id="kotlin-support"><a class="anchor" href="#kotlin-support"></a>3.9. Kotlin
 </div>
 </div>
 <div class="sect2">
-<h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.10. Groovy support</h3>
+<h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.12. Groovy support</h3>
 <div class="paragraph">
 <p>The projects that use <code>Groovy</code> should use:</p>
 </div>
@@ -834,19 +924,13 @@ <h3 id="groovy-support"><a class="anchor" href="#groovy-support"></a>3.10. Groov
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
 <div class="sect2">
-<h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Javadoc support</h3>
+<h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.13. Javadoc support</h3>
 <div class="paragraph">
 <p><code>springdoc-openapi</code> can introspect <code>Javadoc</code> annotations and comments:</p>
 </div>
@@ -872,14 +956,8 @@ <h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Jav
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -938,7 +1016,7 @@ <h3 id="javadoc-support"><a class="anchor" href="#javadoc-support"></a>3.11. Jav
 </div>
 </div>
 <div class="sect2">
-<h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"></a>3.12. Springdoc-openapi BOM</h3>
+<h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"></a>3.14. Springdoc-openapi BOM</h3>
 <div class="paragraph">
 <p>Starting from version <code>v2.8.7</code>, <code>springdoc-openapi</code> provides a BOM (Bill of Materials) to manage the dependencies of the project.
 You can declare it in your project as follows:</p>
@@ -950,7 +1028,7 @@ <h3 id="springdoc-openapi-bom"><a class="anchor" href="#springdoc-openapi-bom"><
             &lt;dependency&gt;
                 &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
                 &lt;artifactId&gt;springdoc-openapi-bom&lt;/artifactId&gt;
-                &lt;version&gt;3.0.0-M1&lt;/version&gt;
+                &lt;version&gt;3.0.0&lt;/version&gt;
                 &lt;type&gt;pom&lt;/type&gt;
                 &lt;scope&gt;import&lt;/scope&gt;
             &lt;/dependency&gt;
@@ -1989,6 +2067,12 @@ <h3 id="springdoc-applications-demos"><a class="anchor" href="#springdoc-applica
 <p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with OpenAPI 3</a></p>
 </li>
 <li>
+<p><a href="https://demos1.springdoc.org/demo-spring-boot-webmvc-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 4  Web MVC with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
+<p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux-scalar/scalar" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with OpenAPI 3 and Scalar</a></p>
+</li>
+<li>
 <p><a href="https://demos1.springdoc.org/demo-spring-boot-webflux-functional/swagger-ui.html" target="_blank" rel="noopener">Demo Spring Boot 4 WebFlux with Functional endpoints OpenAPI 3</a></p>
 </li>
 <li>
@@ -2049,7 +2133,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -2698,14 +2782,8 @@ <h3 id="how-can-i-ignore-authenticationprincipal-parameter-from-spring-security"
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </li>
@@ -4371,7 +4449,7 @@ <h3 id="what-is-the-compatibility-matrix-of-springdoc-openapi-with-spring-boot">
 <p><code>springdoc-openapi 3.x</code> is compatible with <code>spring-boot 4</code>.</p>
 </div>
 <div class="paragraph">
-<p>In general, <strong>you should only pick the last stable version as per today 3.0.0-M1.</strong></p>
+<p>In general, <strong>you should only pick the last stable version as per today 3.0.0.</strong></p>
 </div>
 <div class="paragraph">
 <p>More precisely, this the exhaustive list of spring-boot versions against which <code>springdoc-openapi</code> has been built:</p>
diff --git a/docs/v4/intro.html b/docs/v4/intro.html
index 25186c4..5f51992 100644
--- a/docs/v4/intro.html
+++ b/docs/v4/intro.html
@@ -58,6 +58,9 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 <p>Swagger-ui</p>
 </li>
 <li>
+<p>Scalar</p>
+</li>
+<li>
 <p>OAuth 2</p>
 </li>
 <li>
@@ -81,7 +84,7 @@ <h2 id="Introduction"><a class="anchor" href="#Introduction"></a>Introduction</h
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-22 15:03:46 +0200
+Last updated 2025-09-07 17:01:40 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v4/migrating-from-springfox.html b/docs/v4/migrating-from-springfox.html
index d3dedfa..9cdccc1 100644
--- a/docs/v4/migrating-from-springfox.html
+++ b/docs/v4/migrating-from-springfox.html
@@ -44,7 +44,7 @@ <h2 id="migrating-from-springfox"><a class="anchor" href="#migrating-from-spring
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
diff --git a/docs/v4/modules.html b/docs/v4/modules.html
index 942176e..0715d9c 100644
--- a/docs/v4/modules.html
+++ b/docs/v4/modules.html
@@ -73,7 +73,7 @@ <h3 id="_spring_webmvc_support"><a class="anchor" href="#_spring_webmvc_support"
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webmvc-api&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -125,7 +125,104 @@ <h3 id="_spring_webflux_support"><a class="anchor" href="#_spring_webflux_suppor
 <pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
       &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
       &lt;artifactId&gt;springdoc-openapi-starter-webflux-api&lt;/artifactId&gt;
-      &lt;version&gt;3.0.0-M1&lt;/version&gt;
+      &lt;version&gt;3.0.0&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_swagger_ui_support"><a class="anchor" href="#_swagger_ui_support"></a>Swagger-UI support</h3>
+<div class="paragraph">
+<p><a href="https://swagger.io/tools/swagger-ui/">Swagger UI</a> allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-ui&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_scalar_support"><a class="anchor" href="#_scalar_support"></a>Scalar support</h3>
+<div class="paragraph">
+<p><a href="https://scalar.com/">Scalar</a> is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications.
+It’s particularly aimed at improving the developer experience when exploring APIs.</p>
+</div>
+<div class="paragraph">
+<p><code>springdoc-openapi</code> extends <code>Scalar</code> configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix <code>scalar</code>, as explained in the <a href="https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties">Scalar documentation</a>.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The Swagger UI page will then be available at <code>http://server:port/context-path/scalar</code> and the OpenAPI description will be available at the following url for json format: <code>http://server:port/context-path/v3/api-docs</code></p>
+<div class="ulist">
+<ul>
+<li>
+<p>server: The server name or IP</p>
+</li>
+<li>
+<p>port: The server port</p>
+</li>
+<li>
+<p>context-path: The context path of the application</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>If your project is using <code>spring-boot-starter-web</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webmvc-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
+   &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>If your project is using <code>spring-boot-starter-webflux</code> and you need the access to the swagger-ui, add the following dependency:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">   &lt;dependency&gt;
+      &lt;groupId&gt;org.springdoc&lt;/groupId&gt;
+      &lt;artifactId&gt;springdoc-openapi-starter-webflux-scalar&lt;/artifactId&gt;
+      &lt;version&gt;2.8.14&lt;/version&gt;
    &lt;/dependency&gt;</code></pre>
 </div>
 </div>
@@ -185,14 +282,8 @@ <h3 id="_spring_security_support"><a class="anchor" href="#_spring_security_supp
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
@@ -373,10 +464,10 @@ <h3 id="_spring_cloud_function_web_support"><a class="anchor" href="#_spring_clo
 <div class="ulist">
 <ul>
 <li>
-<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-ui</code> dependency.</p>
+<p>If you are using <code>spring-web</code>, simply add the <code>springdoc-openapi-starter-webmvc-api</code> dependency.</p>
 </li>
 <li>
-<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-ui</code> dependency.</p>
+<p>If you are using <code>spring-webflux</code>, simply add the <code>springdoc-openapi-starter-webflux-api</code> dependency.</p>
 </li>
 </ul>
 </div>
@@ -469,14 +560,8 @@ <h3 id="_kotlin_support"><a class="anchor" href="#_kotlin_support"></a>Kotlin su
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -511,14 +596,8 @@ <h3 id="_groovy_support"><a class="anchor" href="#_groovy_support"></a>Groovy su
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 </div>
@@ -549,14 +628,8 @@ <h3 id="_javadoc_support"><a class="anchor" href="#_javadoc_support"></a>Javadoc
 <p><code>springdoc-openapi-starter-webmvc-api</code> if they depend on <code>spring-boot-starter-web</code> and they only need the access to the OpenAPI endpoints.</p>
 </li>
 <li>
-<p>OR <code>springdoc-openapi-starter-webmvc-ui</code>, if they depend on <code>spring-boot-starter-web</code> and they also need the access to the swagger-ui.</p>
-</li>
-<li>
 <p>OR <code>springdoc-openapi-starter-webflux-api</code> if they depend on <code>spring-boot-starter-webflux</code> and they only the access to the OpenAPI endpoints.</p>
 </li>
-<li>
-<p>OR <code>springdoc-openapi-starter-webflux-ui</code>, if they depend on <code>spring-boot-starter-webflux</code> and they also need the access to the swagger-ui.</p>
-</li>
 </ul>
 </div>
 <div class="admonitionblock note">
@@ -627,7 +700,7 @@ <h3 id="_springdoc_openapi_bom"><a class="anchor" href="#_springdoc_openapi_bom"
 			&lt;dependency&gt;
 				&lt;groupId&gt;org.springdoc&lt;/groupId&gt;
 				&lt;artifactId&gt;springdoc-openapi-bom&lt;/artifactId&gt;
-                &lt;version&gt;3.0.0-M1&lt;/version&gt;
+                &lt;version&gt;3.0.0&lt;/version&gt;
 				&lt;type&gt;pom&lt;/type&gt;
 				&lt;scope&gt;import&lt;/scope&gt;
 			&lt;/dependency&gt;
@@ -641,7 +714,7 @@ <h3 id="_springdoc_openapi_bom"><a class="anchor" href="#_springdoc_openapi_bom"
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-22 13:21:12 +0200
+Last updated 2025-09-07 17:07:48 +0200
 </div>
 </div>
 </div>
diff --git a/docs/v4/properties.html b/docs/v4/properties.html
index 8389073..cb6014b 100644
--- a/docs/v4/properties.html
+++ b/docs/v4/properties.html
@@ -239,7 +239,7 @@ <h3 id="_springdoc_openapi_core_properties"><a class="anchor" href="#_springdoc_
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.use-management-port</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui on the actuator management port.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Boolean</code>. To expose the swagger-ui/scalar on the actuator management port.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">springdoc.disable-i18n</p></td>
diff --git a/pom.xml b/pom.xml
index e87fac4..1ca1fd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
 	<version>3.1.2-SNAPSHOT</version>
 
 	<properties>
-		<springdoc.version>2.8.11</springdoc.version>
+		<springdoc.version>2.8.14</springdoc.version>
 		<springdoc-legacy.version>1.8.0</springdoc-legacy.version>
-		<springdoc-upcoming.version>3.0.0-M1</springdoc-upcoming.version>
+		<springdoc-upcoming.version>3.0.0</springdoc-upcoming.version>
 		<java.version>1.8</java.version>
 		<refdocs.build.directory>${project.basedir}/docs</refdocs.build.directory>
 		<spring-doc-resources.version>0.2.5</spring-doc-resources.version>
diff --git a/src/docs/asciidoc/core-properties.adoc b/src/docs/asciidoc/core-properties.adoc
index 86b130b..d7bcd7f 100644
--- a/src/docs/asciidoc/core-properties.adoc
+++ b/src/docs/asciidoc/core-properties.adoc
@@ -40,7 +40,7 @@
 |springdoc.show-login-endpoint | `false` | `Boolean`. To make spring security login-endpoint visible.
 |springdoc.pre-loading-locales  | | `List of Strings`. The list of locales to load OpenAPI on application startup (comma separated). If not specified, it will preload with the default Locale.
 |springdoc.writer-with-order-by-keys | `false` | `Boolean`. Enable a deterministic/alphabetical ordering.
-|springdoc.use-management-port | `false` | `Boolean`. To expose the swagger-ui on the actuator management port.
+|springdoc.use-management-port | `false` | `Boolean`. To expose the swagger-ui/scalar on the actuator management port.
 |springdoc.disable-i18n | `false` | `Boolean`. To disable automatic translation using i18n.
 |springdoc.show-spring-cloud-functions | `true` |  `Boolean`. To display the spring-cloud-function web endpoints.
 |springdoc.enable-groovy | `true` |  `Boolean`. To enable Groovy support.
diff --git a/src/docs/asciidoc/demos.adoc b/src/docs/asciidoc/demos.adoc
index 718fee1..62cd90e 100644
--- a/src/docs/asciidoc/demos.adoc
+++ b/src/docs/asciidoc/demos.adoc
@@ -2,8 +2,10 @@
 == Springdoc-openapi Demos
 
 === springdoc applications demos
-* link:https://demos.springdoc.org/demo-spring-boot-3-webmvc[Demo Spring Boot 3 Web MVC with OpenAPI 3, window="_blank"]
-* link:https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html[Demo Spring Boot 3 WebFlux with OpenAPI 3, window="_blank"]
+* link:https://demos.springdoc.org/demo-spring-boot-3-webmvc[Demo Spring Boot 3 Web MVC with OpenAPI 3 and Swagger-UI, window="_blank"]
+* link:https://demos.springdoc.org/demo-spring-boot-3-webflux/swagger-ui.html[Demo Spring Boot 3 WebFlux with OpenAPI 3 and Swagger-UI, window="_blank"]
+* link:https://demos.springdoc.org/demo-spring-boot-webmvc-scalar/scalar[Demo Spring Boot 3  Web MVC with OpenAPI 3 and Scalar, window="_blank"]
+* link:https://demos.springdoc.org/demo-spring-boot-webflux-scalar/scalar[Demo Spring Boot 3 WebFlux with OpenAPI 3 and Scalar, window="_blank"]
 * link:https://demos.springdoc.org/demo-spring-boot-3-webflux-functional/swagger-ui.html[Demo Spring Boot 3 WebFlux with Functional endpoints OpenAPI 3, window="_blank"]
 * link:https://demos.springdoc.org/demo-spring-hateoas[Demo Spring Boot 3 and Spring Hateoas with OpenAPI 3, window="_blank"]
 * link:https://demos.springdoc.org/spring-cloud-function-webmvc[Demo Spring Boot 3 and Spring Cloud Function Web MVC, window="_blank"]
diff --git a/src/docs/asciidoc/faq.adoc b/src/docs/asciidoc/faq.adoc
index a28a82b..61ce963 100644
--- a/src/docs/asciidoc/faq.adoc
+++ b/src/docs/asciidoc/faq.adoc
@@ -162,11 +162,7 @@ fun swaggerUiConfig(config: SwaggerUiConfigProperties): SwaggerUiConfigPropertie
 * The projects that use `spring-boot-starter-security` or `spring-security-oauth2-authorization-server`  should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
-
-
 
 === Is there a Gradle plugin available?
 * Yes. More details are available, in the link:https://springdoc.org/#gradle-plugin[gradle plugin] section.
diff --git a/src/docs/asciidoc/getting-started.adoc b/src/docs/asciidoc/getting-started.adoc
index 8bc4a06..9f03172 100644
--- a/src/docs/asciidoc/getting-started.adoc
+++ b/src/docs/asciidoc/getting-started.adoc
@@ -22,7 +22,7 @@ This will automatically deploy swagger-ui to a spring-boot application:
 **  context-path: The context path of the application
 *   Documentation will be available in yaml format as well, on the following path : /v3/api-docs.yaml
 
-TIP: For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file: .
+TIP: For custom path of the swagger documentation in HTML format, add a custom springdoc property, in your spring-boot configuration file.
 
 
 [source,properties]
diff --git a/src/docs/asciidoc/intro.adoc b/src/docs/asciidoc/intro.adoc
index 5859101..06362ac 100644
--- a/src/docs/asciidoc/intro.adoc
+++ b/src/docs/asciidoc/intro.adoc
@@ -14,6 +14,7 @@ This library supports:
 *  Spring-boot v3 (Java 17 & Jakarta EE 9)
 *  JSR-303, specifically for @NotNull, @Min, @Max, and @Size.
 *  Swagger-ui
+*  Scalar
 *  OAuth 2
 *  GraalVM native images
 
diff --git a/src/docs/asciidoc/migrating-from-springfox.adoc b/src/docs/asciidoc/migrating-from-springfox.adoc
index 4d74d2e..2c6d371 100644
--- a/src/docs/asciidoc/migrating-from-springfox.adoc
+++ b/src/docs/asciidoc/migrating-from-springfox.adoc
@@ -102,7 +102,7 @@ springdoc.pathsToMatch=/v1, /api/balance/**
   }
 ----
 
-* If the swagger-ui is served behind a proxy:
+* If the swagger-ui/scalar is served behind a proxy:
    ** link:index.html#how-can-i-deploy-springdoc-openapi-starter-webmvc-ui-behind-a-reverse-proxy[how-can-i-deploy-springdoc-openapi-starter-webmvc-ui-behind-a-reverse-proxy]
 * To customise the Swagger UI
    ** link:index.html#how-can-i-configure-swagger-ui[how-can-i-configure-swagger-ui]
diff --git a/src/docs/asciidoc/modules.adoc b/src/docs/asciidoc/modules.adoc
index 295a55a..6ee4a75 100644
--- a/src/docs/asciidoc/modules.adoc
+++ b/src/docs/asciidoc/modules.adoc
@@ -22,7 +22,7 @@ image::img/common.png[Architecture]
    </dependency>
 ----
 
-NOTE: This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui.
+NOTE: This dependency is relevant if you want to generate the OpenAPI description without using the swagger-ui or Scalar.
 
 TIP: For custom path of the OpenAPI documentation in Json format, add a custom springdoc property, in your spring-boot configuration file:
 
@@ -47,6 +47,66 @@ springdoc.api-docs.path=/api-docs
    </dependency>
 ----
 
+=== Swagger-UI support
+
+link:https://swagger.io/tools/swagger-ui/[Swagger UI] allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.
+
+*   If your project is using `spring-boot-starter-web` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+*   If your project is using `spring-boot-starter-webflux` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+=== Scalar support
+
+link:https://scalar.com/[Scalar] is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications. 
+It’s particularly aimed at improving the developer experience when exploring APIs.
+
+`springdoc-openapi` extends `Scalar` configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix `scalar`, as explained in the link:https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties[Scalar documentation].
+
+*   The Swagger UI page will then be available at `\http://server:port/context-path/scalar` and the OpenAPI description will be available at the following url for json format: `\http://server:port/context-path/v3/api-docs`
+**  server: The server name or IP
+**  port: The server port
+**  context-path: The context path of the application
+
+*   If your project is using `spring-boot-starter-web` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-scalar</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+*   If your project is using `spring-boot-starter-webflux` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webflux-scalar</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
 
 === Spring Hateoas support
 The support for Spring Hateoas is available using the dependency springdoc-openapi-hateoas.
@@ -75,9 +135,7 @@ The projects that use `spring-boot-starter-data-rest` should use:
 The projects that use `spring-boot-starter-security` or `spring-security-oauth2-authorization-server`  should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 === Actuator support
 
@@ -92,13 +150,15 @@ Starting from the release `1.5.1`, it will be possible to expose the **swagger-u
 
 NOTE: The actuator management port has to be different from the application port.
 
-To expose the swagger-ui, on the management port, you should set
+To expose the swagger-ui and Scalar, on the management port, you should set
 
 [source,properties]
 ----
 springdoc.use-management-port=true
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
 management.endpoints.web.exposure.include=openapi, swagger-ui
+# This property enables the openapi and scalar endpoints to be exposed beneath the actuator base path.
+management.endpoints.web.exposure.include=openapi, scalar
 ----
 
 Once enabled, you should also be able to see the springdoc-openapi endpoints under: (host and port depends on your settings)
@@ -106,7 +166,7 @@ Once enabled, you should also be able to see the springdoc-openapi endpoints und
 
 For example, if you have the following settings:
 
-Two endpoints will be available:
+These endpoints will be available:
 
 . REST API that holdes the OpenAPI definition:
 
@@ -116,22 +176,26 @@ Two endpoints will be available:
 
 - `\http://serverName:managementPort/actuator/swagger-ui`
 
+. Or An Endpoint, that routes to the scalar:
+
+- `\http://serverName:managementPort/actuator/scalar`
+
 [source,properties]
 ----
 management.server.port=9090
 ----
 
-For the example, you should also be able to see the springdoc-openapi endpoints:
+For the example, you should also be able to see the springdoc-openapi endpoints depending on the chosen UI:
 
 - `\http://serverName:9090/actuator`
-- `\http://serverName:9090/actuator/swagger-ui`
+- `\http://serverName:9090/actuator/swagger-ui` or `\http://serverName:9090/actuator/scalar`
 - `\http://serverName:9090/actuator/openapi`
 
 All the path `springdoc-openapi` properties are not applicable when `springdoc.use-management-port=true`.
 
-TIP: If you want to reach the application endpoints, from the swagger-ui deployed beneath the actuator base path, using a different port from your application, `CORS for your endpoints` on your application level should be enabled.
+TIP: If you want to reach the application endpoints, from the swagger-ui/scalar deployed beneath the actuator base path, using a different port from your application, `CORS for your endpoints` on your application level should be enabled.
 
-Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui.
+Additionally, it is also possible to combine this property, with the existing property to display the actuator endpoints in the swagger-ui/scalar.
 
 [source,properties]
 ----
@@ -146,9 +210,14 @@ The swagger-ui will be then accessible through the actuator port:
 
 - `\http://serverName:managementPort/actuator/swagger-ui`
 
+The scalar UI will be then accessible through the actuator port:
+
+- `\http://serverName:managementPort/actuator/scalar`
+
 If the management port is different from the application port and `springdoc.use-management-port` is not defined but `springdoc.show-actuator` is set to true:
 
 - The swagger-ui will be then accessible through the application port. For example: `\http://serverName:applicationPort/swagger-ui.html`
+- The scalar UI will be then accessible through the application port. For example: `\http://serverName:applicationPort/scalar`
 - A dedicated group for the actuator endpoints will be by default added.
 - If no group is defined for the application, a default one will be added.
 
@@ -163,8 +232,8 @@ Note: The naming of these new endpoints beneath the actuator base path cannot be
 * Since version `v1.6.3`, the support of functional endpoints has been added.
 
 * These starters will display the OpenAPI description of the `spring-cloud-function-web` endpoints.
-- If you are using `spring-web`, simply add the `springdoc-openapi-starter-webmvc-ui` dependency.
-- If you are using `spring-webflux`, simply add the `springdoc-openapi-starter-webflux-ui` dependency.
+- If you are using `spring-web`, simply add the `springdoc-openapi-starter-webmvc-api` dependency.
+- If you are using `spring-webflux`, simply add the `springdoc-openapi-starter-webflux-api` dependency.
 
 
 The customisation of the output can be achieved programmatically through  `OpenApiCustomizer` or with the annotations: `@RouterOperations` and `@RouterOperation`.
@@ -216,9 +285,7 @@ Some code samples are available on GITHUB of demos:
 The projects that use `Kotlin` should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 NOTE: In addition, your project should add `jackson-module-kotlin` as well to have the full support of `Kotlin` types:
 [source,xml, subs="attributes+"]
@@ -234,10 +301,7 @@ NOTE: In addition, your project should add `jackson-module-kotlin` as well to ha
 The projects that use `Groovy` should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
-
 
 === Javadoc support
 
@@ -250,9 +314,7 @@ The projects that use `Groovy` should use:
 The projects that needs `Javadoc` support should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 NOTE: In addition, your project should add https://github.com/dnault/therapi-runtime-javadoc[`therapi-runtime-javadoc`] to read Javadoc comments at runtime.
 Ensure that you add it as well as its annotation processor to your project's dependencies. Otherwise, the Javadoc support will fail silently.
diff --git a/src/docs/asciidoc/v1/intro.adoc b/src/docs/asciidoc/v1/intro.adoc
index 8a15af9..151b53b 100644
--- a/src/docs/asciidoc/v1/intro.adoc
+++ b/src/docs/asciidoc/v1/intro.adoc
@@ -13,6 +13,7 @@ This library supports:
 *  Spring-boot (v1, v2 and v3)
 *  JSR-303, specifically for @NotNull, @Min, @Max, and @Size.
 *  Swagger-ui
+*  Scalar
 *  OAuth 2
 *  GraalVM native images
 
diff --git a/src/docs/asciidoc/v1/migrating-from-springfox.adoc b/src/docs/asciidoc/v1/migrating-from-springfox.adoc
index 890b435..1bd018c 100644
--- a/src/docs/asciidoc/v1/migrating-from-springfox.adoc
+++ b/src/docs/asciidoc/v1/migrating-from-springfox.adoc
@@ -104,7 +104,7 @@ springdoc.pathsToMatch=/v1, /api/balance/**
   }
 ----
 
-* If the swagger-ui is served behind a proxy:
+* If the swagger-ui/scalar is served behind a proxy:
    ** link:index.html#how-can-i-deploy-springdoc-openapi-ui-behind-a-reverse-proxy[how-can-i-deploy-springdoc-openapi-ui-behind-a-reverse-proxy]
 * To customise the Swagger UI
    ** link:index.html#how-can-i-configure-swagger-ui[how-can-i-configure-swagger-ui]
diff --git a/src/docs/asciidoc/v4/demos.adoc b/src/docs/asciidoc/v4/demos.adoc
index e33d9a2..3ee91a1 100644
--- a/src/docs/asciidoc/v4/demos.adoc
+++ b/src/docs/asciidoc/v4/demos.adoc
@@ -4,6 +4,8 @@
 === springdoc applications demos
 * link:https://demos1.springdoc.org/demo-spring-boot-webmvc[Demo Spring Boot 4 Web MVC with OpenAPI 3, window="_blank"]
 * link:https://demos1.springdoc.org/demo-spring-boot-webflux/swagger-ui.html[Demo Spring Boot 4 WebFlux with OpenAPI 3, window="_blank"]
+* link:https://demos1.springdoc.org/demo-spring-boot-webmvc-scalar/scalar[Demo Spring Boot 4  Web MVC with OpenAPI 3 and Scalar, window="_blank"]
+* link:https://demos1.springdoc.org/demo-spring-boot-webflux-scalar/scalar[Demo Spring Boot 4 WebFlux with OpenAPI 3 and Scalar, window="_blank"]
 * link:https://demos1.springdoc.org/demo-spring-boot-webflux-functional/swagger-ui.html[Demo Spring Boot 4 WebFlux with Functional endpoints OpenAPI 3, window="_blank"]
 * link:https://demos1.springdoc.org/demo-spring-hateoas[Demo Spring Boot 4 and Spring Hateoas with OpenAPI 3, window="_blank"]
 * link:https://demos1.springdoc.org/spring-cloud-function-webmvc[Demo Spring Boot 4 and Spring Cloud Function Web MVC, window="_blank"]
diff --git a/src/docs/asciidoc/v4/faq.adoc b/src/docs/asciidoc/v4/faq.adoc
index bd8ae82..088a31a 100644
--- a/src/docs/asciidoc/v4/faq.adoc
+++ b/src/docs/asciidoc/v4/faq.adoc
@@ -162,9 +162,7 @@ fun swaggerUiConfig(config: SwaggerUiConfigProperties): SwaggerUiConfigPropertie
 * The projects that use `spring-boot-starter-security` or `spring-security-oauth2-authorization-server`  should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 
 
diff --git a/src/docs/asciidoc/v4/getting-started.adoc b/src/docs/asciidoc/v4/getting-started.adoc
index 08fcd18..ae89711 100644
--- a/src/docs/asciidoc/v4/getting-started.adoc
+++ b/src/docs/asciidoc/v4/getting-started.adoc
@@ -3,6 +3,7 @@
 
 For the integration between spring-boot and swagger-ui, add the library to the list of your project dependencies (No additional configuration is needed)
 
+=== Maven
 [source,xml, subs="attributes+"]
 ----
    <dependency>
@@ -12,6 +13,16 @@ For the integration between spring-boot and swagger-ui, add the library to the l
    </dependency>
 ----
 
+=== Gradle 
+[source,gradle, subs="attributes+"]
+implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:{springdoc-upcoming-version}'
+
+
+For example, using version 2.8.11:
+[source,gradle]
+----
+implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11'
+----
 
 This will automatically deploy swagger-ui to a spring-boot application:
 
@@ -43,4 +54,4 @@ springdoc.swagger-ui.path=/swagger-ui.html
 <script>
      (adsbygoogle = window.adsbygoogle || []).push({});
 </script>
-++++
\ No newline at end of file
+++++
diff --git a/src/docs/asciidoc/v4/intro.adoc b/src/docs/asciidoc/v4/intro.adoc
index 5ee3ee7..ca6689b 100644
--- a/src/docs/asciidoc/v4/intro.adoc
+++ b/src/docs/asciidoc/v4/intro.adoc
@@ -14,6 +14,7 @@ This library supports:
 *  Spring-boot v4 (Java 17 & Jakarta EE 9)
 *  JSR-303, specifically for @NotNull, @Min, @Max, and @Size.
 *  Swagger-ui
+*  Scalar
 *  OAuth 2
 *  GraalVM native images
 
diff --git a/src/docs/asciidoc/v4/modules.adoc b/src/docs/asciidoc/v4/modules.adoc
index 30bd258..aea53e9 100644
--- a/src/docs/asciidoc/v4/modules.adoc
+++ b/src/docs/asciidoc/v4/modules.adoc
@@ -47,6 +47,66 @@ springdoc.api-docs.path=/api-docs
    </dependency>
 ----
 
+=== Swagger-UI support
+
+link:https://swagger.io/tools/swagger-ui/[Swagger UI] allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.
+
+*   If your project is using `spring-boot-starter-web` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+*   If your project is using `spring-boot-starter-webflux` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+=== Scalar support
+
+link:https://scalar.com/[Scalar] is an open-source API platform, designed for creating beautiful, interactive API documentation and providing a built-in REST API client, with first-class support for OpenAPI (formerly Swagger) specifications.
+It’s particularly aimed at improving the developer experience when exploring APIs.
+
+`springdoc-openapi` extends `Scalar` configuration to make it compatible with Spring Boot applications.
+You can rely on native Scalar configuration properties, using the prefix `scalar`, as explained in the link:https://guides.scalar.com/scalar/scalar-api-references/integrations/spring-boot#configuration-properties[Scalar documentation].
+
+*   The Swagger UI page will then be available at `\http://server:port/context-path/scalar` and the OpenAPI description will be available at the following url for json format: `\http://server:port/context-path/v3/api-docs`
+**  server: The server name or IP
+**  port: The server port
+**  context-path: The context path of the application
+
+*   If your project is using `spring-boot-starter-web` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-scalar</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
+
+*   If your project is using `spring-boot-starter-webflux` and you need the access to the swagger-ui, add the following dependency:
+
+[source,xml, subs="attributes+"]
+----
+   <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webflux-scalar</artifactId>
+      <version>{springdoc-version}</version>
+   </dependency>
+----
 
 === Spring Hateoas support
 The support for Spring Hateoas is available using the dependency springdoc-openapi-hateoas.
@@ -75,9 +135,7 @@ The projects that use `spring-boot-starter-data-rest` should use:
 The projects that use `spring-boot-starter-security` or `spring-security-oauth2-authorization-server`  should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 === Actuator support
 
@@ -163,8 +221,8 @@ Note: The naming of these new endpoints beneath the actuator base path cannot be
 * Since version `v1.6.3`, the support of functional endpoints has been added.
 
 * These starters will display the OpenAPI description of the `spring-cloud-function-web` endpoints.
-- If you are using `spring-web`, simply add the `springdoc-openapi-starter-webmvc-ui` dependency.
-- If you are using `spring-webflux`, simply add the `springdoc-openapi-starter-webflux-ui` dependency.
+- If you are using `spring-web`, simply add the `springdoc-openapi-starter-webmvc-api` dependency.
+- If you are using `spring-webflux`, simply add the `springdoc-openapi-starter-webflux-api` dependency.
 
 
 The customisation of the output can be achieved programmatically through  `OpenApiCustomizer` or with the annotations: `@RouterOperations` and `@RouterOperation`.
@@ -216,9 +274,7 @@ Some code samples are available on GITHUB of demos:
 The projects that use `Kotlin` should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 NOTE: In addition, your project should add `jackson-module-kotlin` as well to have the full support of `Kotlin` types:
 [source,xml, subs="attributes+"]
@@ -234,10 +290,7 @@ NOTE: In addition, your project should add `jackson-module-kotlin` as well to ha
 The projects that use `Groovy` should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
-
 
 === Javadoc support
 
@@ -250,9 +303,7 @@ The projects that use `Groovy` should use:
 The projects that needs `Javadoc` support should use:
 
 - `springdoc-openapi-starter-webmvc-api` if they depend on `spring-boot-starter-web` and they only need the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webmvc-ui`, if they depend on `spring-boot-starter-web` and they also need the access to the swagger-ui.
 - OR `springdoc-openapi-starter-webflux-api` if they depend on `spring-boot-starter-webflux` and they only the access to the OpenAPI endpoints.
-- OR `springdoc-openapi-starter-webflux-ui`, if they depend on `spring-boot-starter-webflux` and they also need the access to the swagger-ui.
 
 NOTE: In addition, your project should add https://github.com/dnault/therapi-runtime-javadoc[`therapi-runtime-javadoc`] to read Javadoc comments at runtime.
 Ensure that you add it as well as its annotation processor to your project's dependencies. Otherwise, the Javadoc support will fail silently.