diff --git a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayFiltersTests.kt b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayFiltersTests.kt
index 17809dab..bc69a3dc 100644
--- a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayFiltersTests.kt
+++ b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayFiltersTests.kt
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController
         // Use reactive web application type
         "spring.main.web-application-type=reactive",
         // Disable gateway discovery - use explicit routes
-        "spring.cloud.gateway.discovery.locator.enabled=false",
+        "spring.cloud.gateway.server.webflux.discovery.locator.enabled=false",
         // Disable actuator security
         "management.security.enabled=false",
         // Set random port
diff --git a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayRoutingTests.kt b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayRoutingTests.kt
index ff94d0ff..f127cfb1 100644
--- a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayRoutingTests.kt
+++ b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewayRoutingTests.kt
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RestController
         // Use reactive web application type
         "spring.main.web-application-type=reactive",
         // Disable gateway discovery - use explicit routes
-        "spring.cloud.gateway.discovery.locator.enabled=false",
+        "spring.cloud.gateway.server.webflux.discovery.locator.enabled=false",
         // Disable actuator security
         "management.security.enabled=false",
         // Set random port
diff --git a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewaySecurityTests.kt b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewaySecurityTests.kt
index 1f09861e..39acd1d2 100644
--- a/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewaySecurityTests.kt
+++ b/infrastructure/gateway/src/test/kotlin/at/mocode/infrastructure/gateway/GatewaySecurityTests.kt
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.*
         // Use reactive web application type
         "spring.main.web-application-type=reactive",
         // Disable gateway discovery - use explicit routes
-        "spring.cloud.gateway.discovery.locator.enabled=false",
+        "spring.cloud.gateway.server.webflux.discovery.locator.enabled=false",
         // Disable actuator security
         "management.security.enabled=false",
         // Set random port