diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheader.adoc
index 0b0921a11e..94b315d8cc 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheader.adoc
@@ -10,14 +10,15 @@ The following example configures an `AddRequestHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_request_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/red
-          filters:
-          - AddRequestHeader=X-Request-red, blue
+      server:
+        webmvc:
+          routes:
+            - id: add_request_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/red
+              filters:
+              - AddRequestHeader=X-Request-red, blue
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheadersifnotpresent.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheadersifnotpresent.adoc
index fda40278c0..2c90428813 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheadersifnotpresent.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestheadersifnotpresent.adoc
@@ -10,14 +10,15 @@ The following example configures an `AddRequestHeadersIfNotPresent` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_request_headers_route_inp
-          uri: https://example.org
-          predicates:
-          - Path=/red
-          filters:
-          - AddRequestHeadersIfNotPresent=X-Request-Color-1:blue,X-Request-Color-2:green
+      server:
+        webmvc:
+          routes:
+            - id: add_request_headers_route_inp
+              uri: https://example.org
+              predicates:
+              - Path=/red
+              filters:
+              - AddRequestHeadersIfNotPresent=X-Request-Color-1:blue,X-Request-Color-2:green
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestparameter.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestparameter.adoc
index 53d306ad59..f7acc603a2 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestparameter.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addrequestparameter.adoc
@@ -10,14 +10,15 @@ application.yml
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_request_parameter_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/addrequestparam
-          filters:
-          - AddRequestParameter=red, blue
+      server:
+        webmvc:
+          routes:
+            - id: add_request_parameter_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/addrequestparam
+              filters:
+              - AddRequestParameter=red, blue
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addresponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addresponseheader.adoc
index 0c678abd3f..2559fe1680 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addresponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/addresponseheader.adoc
@@ -10,14 +10,15 @@ The following example configures an `AddResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: add_response_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/addresheader
-          filters:
-          - AddResponseHeader=X-Response-Red, Blue
+      server:
+        webmvc:
+          routes:
+            - id: add_response_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/addresheader
+              filters:
+              - AddResponseHeader=X-Response-Red, Blue
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/circuitbreaker-filter.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/circuitbreaker-filter.adoc
index 3b80b1e1bd..6bbb8cebf4 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/circuitbreaker-filter.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/circuitbreaker-filter.adoc
@@ -13,14 +13,15 @@ The following example configures a Spring Cloud CircuitBreaker  filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreakernofallback
-          uri: https://example.org
-          predicates:
-          - Path=/anything/circuitbreakernofallback
-          filters:
-          - CircuitBreaker=myCircuitBreaker
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreakernofallback
+              uri: https://example.org
+              predicates:
+              - Path=/anything/circuitbreakernofallback
+              filters:
+              - CircuitBreaker=myCircuitBreaker
 ----
 .GatewaySampleApplication.java
 [source,java]
@@ -59,17 +60,18 @@ The following example configures such a fallback:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreaker_route
-          uri: https://example.org
-          predicates:
-          - Path=/consumingServiceEndpoint
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: myCircuitBreaker
-              fallbackUri: forward:/inCaseOfFailureUseThis
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreaker_route
+              uri: https://example.org
+              predicates:
+              - Path=/consumingServiceEndpoint
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: myCircuitBreaker
+                  fallbackUri: forward:/inCaseOfFailureUseThis
 ----
 
 The following listing does the same thing in Java:
@@ -182,20 +184,21 @@ value or the String representation of the `HttpStatus` enumeration.
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: circuitbreaker_route
-          uri: lb://backing-service:8088
-          predicates:
-          - Path=/consumingServiceEndpoint
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: myCircuitBreaker
-              fallbackUri: forward:/inCaseOfFailureUseThis
-              statusCodes:
-                - 500
-                - "NOT_FOUND"
+      server:
+        webmvc:
+          routes:
+            - id: circuitbreaker_route
+              uri: lb://backing-service:8088
+              predicates:
+              - Path=/consumingServiceEndpoint
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: myCircuitBreaker
+                  fallbackUri: forward:/inCaseOfFailureUseThis
+                  statusCodes:
+                    - 500
+                    - "NOT_FOUND"
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/deduperesponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/deduperesponseheader.adoc
index 5f8a7a2333..2b0ddeab9b 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/deduperesponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/deduperesponseheader.adoc
@@ -10,14 +10,15 @@ The following example configures a `DedupeResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: dedupe_response_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/hello
-          filters:
-          - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
+      server:
+        webmvc:
+          routes:
+            - id: dedupe_response_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/hello
+              filters:
+              - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin
 ----
 .GatewaySampleApplication.java
 [source,java]
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/fallback-headers.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/fallback-headers.adoc
index 2415860009..195ca328c2 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/fallback-headers.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/fallback-headers.adoc
@@ -9,25 +9,26 @@ The `FallbackHeaders` factory lets you add Spring Cloud CircuitBreaker execution
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: ingredients
-          uri: lb://ingredients
-          predicates:
-          - Path=/ingredients/**
-          filters:
-          - name: CircuitBreaker
-            args:
-              name: fetchIngredients
-              fallbackUri: forward:/fallback
-        - id: ingredients-fallback
-          uri: http://localhost:9994
-          predicates:
-          - Path=/fallback
-          filters:
-          - name: FallbackHeaders
-            args:
-              executionExceptionTypeHeaderName: Test-Header
+      server:
+        webmvc:
+          routes:
+            - id: ingredients
+              uri: lb://ingredients
+              predicates:
+              - Path=/ingredients/**
+              filters:
+              - name: CircuitBreaker
+                args:
+                  name: fetchIngredients
+                  fallbackUri: forward:/fallback
+            - id: ingredients-fallback
+              uri: http://localhost:9994
+              predicates:
+              - Path=/fallback
+              filters:
+              - name: FallbackHeaders
+                args:
+                  executionExceptionTypeHeaderName: Test-Header
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/loadbalancer.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/loadbalancer.adoc
index 2135aaf2cd..45312f9120 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/loadbalancer.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/loadbalancer.adoc
@@ -35,12 +35,13 @@ The following listing configures a LoadBalancer Filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: api_route
-          uri: lb://apiservice
-          predicates:
-          - Path=/api/**
+      server:
+        webmvc:
+          routes:
+            - id: api_route
+              uri: lb://apiservice
+              predicates:
+              - Path=/api/**
 ----
 
 WARNING: If using the `lb()` filter, it needs to be after any filter that manipulates the path such as `setPath()` or `stripPrefix()`, otherwise the resulting url could be incorrect. The `lb:` scheme handler in configuration, automatically puts the filter in the highest precedence order.
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/maprequestheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/maprequestheader.adoc
index e85d08b9a4..c0fe25d21b 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/maprequestheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/maprequestheader.adoc
@@ -13,14 +13,15 @@ The following example configures a `MapRequestHeader`:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: map_request_header_route
-          uri: https://example.org
-          predicates:
-          - Path=/mypath
-          filters:
-          - MapRequestHeader=Blue, X-Request-Red
+      server:
+        webmvc:
+          routes:
+            - id: map_request_header_route
+              uri: https://example.org
+              predicates:
+              - Path=/mypath
+              filters:
+              - MapRequestHeader=Blue, X-Request-Red
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/prefixpath.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/prefixpath.adoc
index 5a4d134343..7305d79601 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/prefixpath.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/prefixpath.adoc
@@ -11,14 +11,15 @@ The following example configures a `PrefixPath` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: prefixpath_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - PrefixPath=/mypath
+      server:
+        webmvc:
+          routes:
+            - id: prefixpath_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - PrefixPath=/mypath
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/preservehostheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/preservehostheader.adoc
index 462cf01f67..d89cc9127a 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/preservehostheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/preservehostheader.adoc
@@ -12,14 +12,15 @@ The following example configures a `PreserveHostHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: preserve_host_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - PreserveHostHeader
+      server:
+        webmvc:
+          routes:
+            - id: preserve_host_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - PreserveHostHeader
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/redirectto.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/redirectto.adoc
index 69f2d53876..0372780e0c 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/redirectto.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/redirectto.adoc
@@ -14,14 +14,15 @@ The following listing configures a `RedirectTo` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: redirectto_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RedirectTo=302, https://acme.org
+      server:
+        webmvc:
+          routes:
+            - id: redirectto_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RedirectTo=302, https://acme.org
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removejsonattributesresponsebody.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removejsonattributesresponsebody.adoc
index 77cc4ece88..4b89f7963a 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removejsonattributesresponsebody.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removejsonattributesresponsebody.adoc
@@ -12,12 +12,13 @@ The following example configures an `RemoveJsonAttributesResponseBody` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: removejsonattributes_route
-          uri: https://example.org
-          filters:
-          - RemoveJsonAttributesResponseBody=id,color
+      server:
+        webmvc:
+          routes:
+            - id: removejsonattributes_route
+              uri: https://example.org
+              filters:
+              - RemoveJsonAttributesResponseBody=id,color
 ----
 
 This removes attributes "id" and "color" from the JSON content body at root level.
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestheader.adoc
index 0315090639..7e3cec1650 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestheader.adoc
@@ -12,14 +12,15 @@ The following listing configures a `RemoveRequestHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: removerequestheader_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RemoveRequestHeader=X-Request-Foo
+      server:
+        webmvc:
+          routes:
+            - id: removerequestheader_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RemoveRequestHeader=X-Request-Foo
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestparameter.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestparameter.adoc
index e60eaa9da7..5e0d8ae02b 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestparameter.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removerequestparameter.adoc
@@ -12,14 +12,15 @@ The following example configures a `RemoveRequestParameter` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: removerequestparameter_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RemoveRequestParameter=red
+      server:
+        webmvc:
+          routes:
+            - id: removerequestparameter_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RemoveRequestParameter=red
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removeresponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removeresponseheader.adoc
index d767aba098..02820825fd 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removeresponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/removeresponseheader.adoc
@@ -11,14 +11,15 @@ The following listing configures a `RemoveResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: removeresponseheader_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/removeresponseheader
-          filters:
-          - RemoveResponseHeader=X-Response-Foo
+      server:
+        webmvc:
+          routes:
+            - id: removeresponseheader_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/removeresponseheader
+              filters:
+              - RemoveResponseHeader=X-Response-Foo
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestheadersize.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestheadersize.adoc
index e94b2ff002..0b79a42cfb 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestheadersize.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestheadersize.adoc
@@ -12,14 +12,15 @@ The following listing configures a `RequestHeaderSize` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: requestheadersize_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RequestHeaderSize=1000B
+      server:
+        webmvc:
+          routes:
+            - id: requestheadersize_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RequestHeaderSize=1000B
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestsize.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestsize.adoc
index 7eb84314e0..771b11aa9f 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestsize.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/requestsize.adoc
@@ -13,16 +13,17 @@ The following listing configures a `RequestSize` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: request_size_route
-          uri: http://localhost:8080
-          predicates:
-          - Path=/upload
-          filters:
-          - name: RequestSize
-            args:
-              maxSize: 5000000
+      server:
+        webmvc:
+          routes:
+            - id: request_size_route
+              uri: http://localhost:8080
+              predicates:
+              - Path=/upload
+              filters:
+              - name: RequestSize
+                args:
+                  maxSize: 5000000
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/retry.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/retry.adoc
index ab8d3fa609..a32d8ab02f 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/retry.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/retry.adoc
@@ -34,20 +34,21 @@ The following listing configures a Retry  filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: retry_route
-          uri: http://localhost:8080/flakey
-          predicates:
-          - Host=*.retry.com
-          filters:
-          - name: Retry
-            args:
-              retries: 3
-              series: SERVER_ERROR
-              methods: GET,POST
-              cacheBody: true
-          - name: AdaptCachedBody
+      server:
+        webmvc:
+          routes:
+            - id: retry_route
+              uri: http://localhost:8080/flakey
+              predicates:
+              - Host=*.retry.com
+              filters:
+              - name: Retry
+                args:
+                  retries: 3
+                  series: SERVER_ERROR
+                  methods: GET,POST
+                  cacheBody: true
+              - name: AdaptCachedBody
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritelocationresponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritelocationresponseheader.adoc
index 6af573a193..7dc345331d 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritelocationresponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritelocationresponseheader.adoc
@@ -11,14 +11,15 @@ The following listing configures a `RewriteLocationResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: rewritelocationresponseheader_route
-          uri: http://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RewriteLocationResponseHeader=AS_IN_REQUEST, Location, ,
+      server:
+        webmvc:
+          routes:
+            - id: rewritelocationresponseheader_route
+              uri: http://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RewriteLocationResponseHeader=AS_IN_REQUEST, Location, ,
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritepath.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritepath.adoc
index d423af3977..86f94ebdee 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritepath.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewritepath.adoc
@@ -11,14 +11,15 @@ The following listing configures a `RewritePath` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: rewritepath_route
-          uri: https://example.org
-          predicates:
-          - Path=/red/**
-          filters:
-          - RewritePath=/red/?(?<segment>.*), /$\{segment}
+      server:
+        webmvc:
+          routes:
+            - id: rewritepath_route
+              uri: https://example.org
+              predicates:
+              - Path=/red/**
+              filters:
+              - RewritePath=/red/?(?<segment>.*), /$\{segment}
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriterequestparameter.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriterequestparameter.adoc
index 7ad61594db..e5dd6b22e7 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriterequestparameter.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriterequestparameter.adoc
@@ -12,14 +12,15 @@ The following listing configures a `RewriteRequestParameter` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: rewriterequestparameter_route
-          uri: https://example.org
-          predicates:
-          - Path=/products
-          filters:
-          - RewriteRequestParameter=campaign,fall2023
+      server:
+        webmvc:
+          routes:
+            - id: rewriterequestparameter_route
+              uri: https://example.org
+              predicates:
+              - Path=/products
+              filters:
+              - RewriteRequestParameter=campaign,fall2023
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriteresponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriteresponseheader.adoc
index 7e0cb2c9a8..8688ada471 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriteresponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/rewriteresponseheader.adoc
@@ -12,14 +12,15 @@ The following example configures a `RewriteResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: rewriteresponseheader_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - RewriteResponseHeader=X-Response-Red, password=[^&]+, password=***
+      server:
+        webmvc:
+          routes:
+            - id: rewriteresponseheader_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - RewriteResponseHeader=X-Response-Red, password=[^&]+, password=***
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/savesession.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/savesession.adoc
index 4e47a7f4b7..5aa5bd33de 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/savesession.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/savesession.adoc
@@ -11,14 +11,15 @@ The following example configures a `SaveSession` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: save_session
-          uri: https://example.org
-          predicates:
-          - Path=/foo/**
-          filters:
-          - SaveSession=
+      server:
+        webmvc:
+          routes:
+            - id: save_session
+              uri: https://example.org
+              predicates:
+              - Path=/foo/**
+              filters:
+              - SaveSession=
 ----
 
 If you integrate https://projects.spring.io/spring-security/[Spring Security] with Spring Session and want to ensure security details have been forwarded to the remote process, this is critical.
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setpath.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setpath.adoc
index 73624a703a..868c062a69 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setpath.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setpath.adoc
@@ -13,14 +13,15 @@ The following example configures a `SetPath` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: setpath_route
-          uri: https://example.org
-          predicates:
-          - Path=/red/{segment}
-          filters:
-          - SetPath=/{segment}
+      server:
+        webmvc:
+          routes:
+            - id: setpath_route
+              uri: https://example.org
+              predicates:
+              - Path=/red/{segment}
+              filters:
+              - SetPath=/{segment}
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequestheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequestheader.adoc
index a2c7676b19..e3ae1d0844 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequestheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequestheader.adoc
@@ -10,14 +10,15 @@ The following listing configures a `SetRequestHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: setrequestheader_route
-          uri: https://example.org
-          predicates:
-          - Path=/**
-          filters:
-          - SetRequestHeader=X-Request-Red, Blue
+      server:
+        webmvc:
+          routes:
+            - id: setrequestheader_route
+              uri: https://example.org
+              predicates:
+              - Path=/**
+              filters:
+              - SetRequestHeader=X-Request-Red, Blue
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequesthostheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequesthostheader.adoc
index d12b23c64c..f352874aa3 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequesthostheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setrequesthostheader.adoc
@@ -11,16 +11,17 @@ The following listing configures a `SetRequestHostHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: set_request_host_header_route
-          uri: http://localhost:8080
-          predicates:
-          - Path=/headers
-          filters:
-          - name: SetRequestHostHeader
-            args:
-              host: example.org
+      server:
+        webmvc:
+          routes:
+            - id: set_request_host_header_route
+              uri: http://localhost:8080
+              predicates:
+              - Path=/headers
+              filters:
+              - name: SetRequestHostHeader
+                args:
+                  host: example.org
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setresponseheader.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setresponseheader.adoc
index 5537554685..86daabd62a 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setresponseheader.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setresponseheader.adoc
@@ -10,14 +10,15 @@ The following listing configures a `SetResponseHeader` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: setresponseheader_route
-          uri: https://example.org
-          predicates:
-          - Path=/anything/setresponseheader
-          filters:
-          - SetResponseHeader=X-Response-Red, Blue
+      server:
+        webmvc:
+          routes:
+            - id: setresponseheader_route
+              uri: https://example.org
+              predicates:
+              - Path=/anything/setresponseheader
+              filters:
+              - SetResponseHeader=X-Response-Red, Blue
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setstatus.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setstatus.adoc
index bd9bbe2519..6ba42d1365 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setstatus.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/setstatus.adoc
@@ -12,20 +12,21 @@ The following listing configures a `SetStatus` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: setstatusstring_route
-          uri: https://example.org
-          predicates:
-          - Path=/path1
-          filters:
-          - SetStatus=UNAUTHORIZED
-        - id: setstatusint_route
-          uri: https://example.org
-          predicates:
-          - Path=/path2
-          filters:
-          - SetStatus=401
+      server:
+        webmvc:
+          routes:
+            - id: setstatusstring_route
+              uri: https://example.org
+              predicates:
+              - Path=/path1
+              filters:
+              - SetStatus=UNAUTHORIZED
+            - id: setstatusint_route
+              uri: https://example.org
+              predicates:
+              - Path=/path2
+              filters:
+              - SetStatus=401
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/stripprefix.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/stripprefix.adoc
index 902974ce07..bcb955b69e 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/stripprefix.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/stripprefix.adoc
@@ -11,14 +11,15 @@ The following listing configures a `StripPrefix` filter:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: strip_prefix_route
-          uri: https://example.org
-          predicates:
-          - Path=/name/**
-          filters:
-          - StripPrefix=2
+      server:
+        webmvc:
+          routes:
+            - id: strip_prefix_route
+              uri: https://example.org
+              predicates:
+              - Path=/name/**
+              filters:
+              - StripPrefix=2
 ----
 
 .GatewaySampleApplication.java
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/tokenrelay.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/tokenrelay.adoc
index ae9756626f..f61e207e32 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/tokenrelay.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/filters/tokenrelay.adoc
@@ -77,14 +77,15 @@ or this
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: resource
-          uri: http://localhost:9000
-          predicates:
-          - Path=/resource
-          filters:
-          - TokenRelay=
+      server:
+        webmvc:
+          routes:
+            - id: resource
+              uri: http://localhost:9000
+              predicates:
+              - Path=/resource
+              filters:
+              - TokenRelay=
 ----
 
 and it will (in addition to logging the user in and grabbing a token)
diff --git a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/gateway-request-predicates.adoc b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/gateway-request-predicates.adoc
index 5631cbf873..833920268f 100644
--- a/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/gateway-request-predicates.adoc
+++ b/docs/modules/ROOT/pages/spring-cloud-gateway-server-webmvc/gateway-request-predicates.adoc
@@ -19,12 +19,13 @@ The following example configures an after route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: after_route
-          uri: https://example.org
-          predicates:
-          - After=2017-01-20T17:42:47.789-07:00[America/Denver]
+      server:
+        webmvc:
+          routes:
+            - id: after_route
+              uri: https://example.org
+              predicates:
+              - After=2017-01-20T17:42:47.789-07:00[America/Denver]
 ----
 
 .GatewaySampleApplication.java
@@ -64,12 +65,13 @@ The following example configures a before route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: before_route
-          uri: https://example.org
-          predicates:
-          - Before=2017-01-20T17:42:47.789-07:00[America/Denver]
+      server:
+        webmvc:
+          routes:
+            - id: before_route
+              uri: https://example.org
+              predicates:
+              - Before=2017-01-20T17:42:47.789-07:00[America/Denver]
 ----
 
 .GatewaySampleApplication.java
@@ -111,12 +113,13 @@ The following example configures a between route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: between_route
-          uri: https://example.org
-          predicates:
-          - Between=2017-01-20T17:42:47.789-07:00[America/Denver], 2017-01-21T17:42:47.789-07:00[America/Denver]
+      server:
+        webmvc:
+          routes:
+            - id: between_route
+              uri: https://example.org
+              predicates:
+              - Between=2017-01-20T17:42:47.789-07:00[America/Denver], 2017-01-21T17:42:47.789-07:00[America/Denver]
 ----
 
 .GatewaySampleApplication.java
@@ -158,12 +161,13 @@ The following example configures a cookie route predicate factory:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: cookie_route
-          uri: https://example.org
-          predicates:
-          - Cookie=chocolate, ch.p
+      server:
+        webmvc:
+          routes:
+            - id: cookie_route
+              uri: https://example.org
+              predicates:
+              - Cookie=chocolate, ch.p
 ----
 
 .GatewaySampleApplication.java
@@ -201,13 +205,13 @@ The following example configures a header route predicate:
 ----
 spring:
   cloud:
-    gateway:
-      mvc:
+    server:
+      webmvc:
         routes:
-        - id: header_route
-          uri: https://example.org
-          predicates:
-          - Header=X-Request-Id, \d+
+            - id: header_route
+              uri: https://example.org
+              predicates:
+              - Header=X-Request-Id, \d+
 ----
 
 .GatewaySampleApplication.java
@@ -247,12 +251,13 @@ The following example configures a host route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: host_route
-          uri: https://example.org
-          predicates:
-          - Host=**.somehost.org,**.anotherhost.org
+      server:
+        webmvc:
+          routes:
+            - id: host_route
+              uri: https://example.org
+              predicates:
+              - Host=**.somehost.org,**.anotherhost.org
 ----
 
 .GatewaySampleApplication.java
@@ -297,12 +302,13 @@ The following example configures a method route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: method_route
-          uri: https://example.org
-          predicates:
-          - Method=GET,POST
+      server:
+        webmvc:
+          routes:
+            - id: method_route
+              uri: https://example.org
+              predicates:
+              - Method=GET,POST
 ----
 
 .GatewaySampleApplication.java
@@ -367,12 +373,13 @@ The following example configures a path route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: path_route
-          uri: https://example.org
-          predicates:
-          - Path=/red/{segment},/blue/{segment}
+      server:
+        webmvc:
+          routes:
+            - id: path_route
+              uri: https://example.org
+              predicates:
+              - Path=/red/{segment},/blue/{segment}
 ----
 
 .GatewaySampleApplication.java
@@ -426,12 +433,13 @@ The following example configures a query route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: query_route
-          uri: https://example.org
-          predicates:
-          - Query=green
+      server:
+        webmvc:
+          routes:
+            - id: query_route
+              uri: https://example.org
+              predicates:
+              - Query=green
 ----
 
 .GatewaySampleApplication.java
@@ -463,12 +471,13 @@ The preceding route matches if the request contained a `green` query parameter.
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: query_route
-          uri: https://example.org
-          predicates:
-          - Query=red, gree.
+      server:
+        webmvc:
+          routes:
+            - id: query_route
+              uri: https://example.org
+              predicates:
+              - Query=red, gree.
 ----
 
 .GatewaySampleApplication.java
@@ -508,12 +517,13 @@ The following example configures a RemoteAddr route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: remoteaddr_route
-          uri: https://example.org
-          predicates:
-          - RemoteAddr=192.168.1.1/24
+      server:
+        webmvc:
+          routes:
+            - id: remoteaddr_route
+              uri: https://example.org
+              predicates:
+              - RemoteAddr=192.168.1.1/24
 ----
 
 This route matches if the remote address of the request was, for example, `192.168.1.10`.
@@ -588,16 +598,17 @@ The following example configures a weight route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: weight_high
-          uri: https://weighthigh.org
-          predicates:
-          - Weight=group1, 8
-        - id: weight_low
-          uri: https://weightlow.org
-          predicates:
-          - Weight=group1, 2
+      server:
+        webmvc:
+          routes:
+            - id: weight_high
+              uri: https://weighthigh.org
+              predicates:
+              - Weight=group1, 8
+            - id: weight_low
+              uri: https://weightlow.org
+              predicates:
+              - Weight=group1, 2
 ----
 
 .GatewaySampleApplication.java
@@ -650,12 +661,13 @@ The following example configures a XForwardedRemoteAddr route predicate:
 spring:
   cloud:
     gateway:
-      mvc:
-        routes:
-        - id: xforwarded_remoteaddr_route
-          uri: https://example.org
-          predicates:
-          - XForwardedRemoteAddr=192.168.1.1/24
+      server:
+        webmvc:
+          routes:
+            - id: xforwarded_remoteaddr_route
+              uri: https://example.org
+              predicates:
+              - XForwardedRemoteAddr=192.168.1.1/24
 ----
 
 This route matches if the `X-Forwarded-For` header contains, for example, `192.168.1.10`.