diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapper.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapper.java
index 6b6820124e..30e4817ca4 100644
--- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapper.java
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapper.java
@@ -29,7 +29,6 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerBootstrapper;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerInstanceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -53,14 +52,11 @@ public void initialize(BootstrapRegistry registry) {
 
 	final static class KubernetesFunction implements ConfigServerInstanceProvider.Function {
 
-		private final BootstrapContext context;
-
-		private KubernetesFunction(BootstrapContext context) {
-			this.context = context;
+		private KubernetesFunction() {
 		}
 
 		static KubernetesFunction create(BootstrapContext context) {
-			return new KubernetesFunction(context);
+			return new KubernetesFunction();
 		}
 
 		@Override
@@ -73,18 +69,12 @@ public List<ServiceInstance> apply(String serviceId, Binder binder, BindHandler
 				// Kubernetes DiscoveryClient
 				return Collections.emptyList();
 			}
-			KubernetesDiscoveryProperties discoveryProperties = createKubernetesDiscoveryProperties(binder,
-					bindHandler);
-			KubernetesClientProperties clientProperties = createKubernetesClientProperties(binder, bindHandler);
-			return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler, log)
-					.getInstances(serviceId);
+			return getInstanceProvider(binder, bindHandler).getInstances(serviceId);
 		}
 
-		private KubernetesConfigServerInstanceProvider getInstanceProvider(
-				KubernetesDiscoveryProperties discoveryProperties, KubernetesClientProperties clientProperties,
-				BootstrapContext context, Binder binder, BindHandler bindHandler, Log log) {
+		private KubernetesConfigServerInstanceProvider getInstanceProvider(Binder binder, BindHandler bindHandler) {
 			KubernetesDiscoveryClientProperties kubernetesDiscoveryClientProperties = binder
-					.bind("spring.cloud.kubernetes.discovery", Bindable.of(KubernetesDiscoveryClientProperties.class),
+					.bind(KubernetesDiscoveryProperties.PREFIX, Bindable.of(KubernetesDiscoveryClientProperties.class),
 							bindHandler)
 					.orElseGet(KubernetesDiscoveryClientProperties::new);
 			KubernetesDiscoveryClientAutoConfiguration.Servlet autoConfiguration = new KubernetesDiscoveryClientAutoConfiguration.Servlet();
diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
index a14929ff08..a6b2aa73d7 100644
--- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
@@ -43,6 +43,8 @@
 
 /**
  * @author Ryan Baxter
+ * @deprecated in favor of {@link KubernetesDiscoveryClientBlockingAutoConfiguration} and
+ * {@link KubernetesDiscoveryClientReactiveAutoConfiguration}
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
@@ -50,6 +52,7 @@
 @ConditionalOnKubernetesDiscoveryEnabled
 @EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
 		KubernetesDiscoveryClientProperties.class })
+@Deprecated(forRemoval = true)
 public class KubernetesDiscoveryClientAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java
new file mode 100644
index 0000000000..0a6089ca0b
--- /dev/null
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.discovery;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
+import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
+import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author wind57
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnKubernetesDiscoveryEnabled
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
+		KubernetesDiscoveryClientProperties.class })
+class KubernetesDiscoveryClientBlockingAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnMissingBean(RestTemplate.class)
+	RestTemplate restTemplate() {
+		return new RestTemplateBuilder().build();
+	}
+
+	@Bean
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	KubernetesDiscoveryClient kubernetesDiscoveryClient(RestTemplate restTemplate,
+			KubernetesDiscoveryClientProperties properties) {
+		return new KubernetesDiscoveryClient(restTemplate, properties);
+	}
+
+	@Bean
+	@ConditionalOnClass({ HealthIndicator.class })
+	@ConditionalOnDiscoveryHealthIndicatorEnabled
+	InitializingBean indicatorInitializer(ApplicationEventPublisher applicationEventPublisher,
+			ApplicationContext applicationContext) {
+		InitializingBean bean = () -> applicationEventPublisher
+				.publishEvent(new InstanceRegisteredEvent<>(applicationContext.getId(), null));
+		return bean;
+
+	}
+
+}
diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java
new file mode 100644
index 0000000000..d9140d5146
--- /dev/null
+++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.discovery;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
+import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
+import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
+import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * @author wind57
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnKubernetesDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
+		KubernetesDiscoveryClientProperties.class })
+class KubernetesDiscoveryClientReactiveAutoConfiguration {
+
+	@Bean
+	@ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" })
+	@ConditionalOnMissingBean(WebClient.Builder.class)
+	WebClient.Builder webClientBuilder() {
+		return WebClient.builder();
+	}
+
+	@Bean
+	@ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" })
+	KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(WebClient.Builder webClientBuilder,
+			KubernetesDiscoveryClientProperties properties) {
+		return new KubernetesReactiveDiscoveryClient(webClientBuilder, properties);
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
+	@ConditionalOnDiscoveryHealthIndicatorEnabled
+	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
+			KubernetesReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties,
+			ApplicationContext applicationContext) {
+		ReactiveDiscoveryClientHealthIndicator healthIndicator = new ReactiveDiscoveryClientHealthIndicator(client,
+				properties);
+		InstanceRegisteredEvent event = new InstanceRegisteredEvent(applicationContext.getId(), null);
+		healthIndicator.onApplicationEvent(event);
+		return healthIndicator;
+	}
+
+}
diff --git a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index d9d4dd270d..67bac3b304 100644
--- a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1,2 @@
-org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientAutoConfiguration
+org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientBlockingAutoConfiguration
+org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientReactiveAutoConfiguration
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java
index d911c0cce0..c60af2f3bb 100644
--- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java
@@ -68,9 +68,21 @@ void beforeAll() throws JsonProcessingException {
 		wireMockServer = new WireMockServer(options().dynamicPort());
 		wireMockServer.start();
 		WireMock.configureFor(wireMockServer.port());
-		String APPS_NAME = "[{\"instanceId\":\"uid2\",\"serviceId\":\"spring-cloud-kubernetes-configserver\",\"host\":\"localhost\",\"port\":"
-				+ wireMockServer.port() + ",\"uri\":\"" + wireMockServer.baseUrl()
-				+ "\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]";
+		String APPS_NAME = """
+								[{
+									"instanceId": "uid2",
+									"serviceId": "spring-cloud-kubernetes-configserver",
+									"host": "localhost",
+									"port": "%s",
+									"uri": "%s",
+									"secure":false,
+									"metadata":{"spring": "true", "http": "8080", "k8s": "true"},
+									"namespace": "namespace1",
+									"cluster": null,
+									"scheme":"http"
+					}]
+				""".formatted(wireMockServer.port(), wireMockServer.baseUrl());
+
 		stubFor(get("/apps/spring-cloud-kubernetes-configserver").willReturn(
 				aResponse().withStatus(200).withBody(APPS_NAME).withHeader("content-type", "application/json")));
 		Environment environment = new Environment("test", "default");
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java
new file mode 100644
index 0000000000..c62e61ef58
--- /dev/null
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryAutoConfigurationTests.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.discovery;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.FilteredClassLoader;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author wind57
+ */
+class KubernetesDiscoveryAutoConfigurationTests {
+
+	/**
+	 * <pre>
+	 *     '@ConditionalOnDiscoveryEnabled' is not matched, thus no beans are created
+	 *     from either blocking or reactive configurations.
+	 * </pre>
+	 */
+	@Test
+	void discoveryDisabled() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     '@ConditionalOnKubernetesDiscoveryEnabled' is not matched, thus no beans are created
+	 *     from either blocking or reactive configurations.
+	 * </pre>
+	 */
+	@Test
+	void kubernetesDiscoveryDisabled() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.kubernetes.discovery.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     '@ConditionalOnCloudPlatform' does not match 'KUBERNETES', thus no beans are created
+	 *     from either blocking or reactive configurations.
+	 * </pre>
+	 */
+	@Test
+	void cloudPlatformDisabled() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=none");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     - reactive config is disabled, blocking is defaulted.
+	 *     - WebClient class is not present
+	 * </pre>
+	 */
+	@Test
+	void reactiveDisabledBlockingEnabledWebClientPresent() {
+		setupWithFilteredClassLoader(WebClient.class, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=false",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(RestTemplate.class);
+			assertThat(context).hasSingleBean(KubernetesDiscoveryClient.class);
+			assertThat(context).getBean("indicatorInitializer").isNotNull();
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     - reactive config is disabled, blocking is defaulted.
+	 *     - WebClient class is present
+	 * </pre>
+	 */
+	@Test
+	void reactiveDisabledBlockingEnabledWebClientMissing() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=false",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).getBean("indicatorInitializer").isNotNull();
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     - reactive config is disabled, blocking is defaulted.
+	 *     - WebClient class is present
+	 * </pre>
+	 */
+	@Test
+	void reactiveDisabledBlockingEnabledWebClientMissingHealthIndicatorMissing() {
+		setupWithFilteredClassLoader(HealthIndicator.class, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=false",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).doesNotHaveBean("indicatorInitializer");
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     '@ConditionalOnDiscoveryHealthIndicatorEnabled' not matched.
+	 * </pre>
+	 */
+	@Test
+	void blockingHealthIndicatorDisabled() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=true",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver",
+				"spring.cloud.discovery.client.health-indicator.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).doesNotHaveBean("indicatorInitializer");
+
+			assertThat(context).hasSingleBean(WebClient.Builder.class);
+			assertThat(context).hasSingleBean(KubernetesReactiveDiscoveryClient.class);
+
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     - reactive config is enabled, blocking is defaulted.
+	 *     - WebClient class is present
+	 * </pre>
+	 */
+	@Test
+	void reactiveEnabledBlockingEnabledWebClientPresent() {
+		setupWithFilteredClassLoader(null, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=true",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(RestTemplate.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).getBean("indicatorInitializer").isNotNull();
+
+			assertThat(context).hasSingleBean(WebClient.Builder.class);
+			assertThat(context).hasSingleBean(KubernetesReactiveDiscoveryClient.class);
+			assertThat(context).getBean("kubernetesReactiveDiscoveryClientHealthIndicator").isNotNull();
+		});
+	}
+
+	/**
+	 * <pre>
+	 *     - reactive config is enabled, blocking is defaulted.
+	 *     - WebClient class is missing
+	 * </pre>
+	 */
+	@Test
+	void reactiveEnabledBlockingEnabledWebClientMissing() {
+		setupWithFilteredClassLoader(WebClient.class, "spring.main.cloud-platform=KUBERNETES",
+				"spring.cloud.discovery.reactive.enabled=true",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(RestTemplate.class);
+			assertThat(context).hasSingleBean(KubernetesDiscoveryClient.class);
+			assertThat(context).getBean("indicatorInitializer").isNotNull();
+
+			assertThat(context).doesNotHaveBean(WebClient.Builder.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+			assertThat(context).getBean("kubernetesReactiveDiscoveryClientHealthIndicator").isNull();
+		});
+	}
+
+	private ApplicationContextRunner applicationContextRunner;
+
+	private void setupWithFilteredClassLoader(Class<?> cls, String... properties) {
+
+		if (cls != null) {
+			applicationContextRunner = new ApplicationContextRunner()
+					.withConfiguration(AutoConfigurations.of(KubernetesDiscoveryClientBlockingAutoConfiguration.class,
+							KubernetesDiscoveryClientReactiveAutoConfiguration.class))
+					.withClassLoader(new FilteredClassLoader(cls)).withPropertyValues(properties);
+		}
+		else {
+			applicationContextRunner = new ApplicationContextRunner()
+					.withConfiguration(AutoConfigurations.of(KubernetesDiscoveryClientBlockingAutoConfiguration.class,
+							KubernetesDiscoveryClientReactiveAutoConfiguration.class))
+					.withPropertyValues(properties);
+		}
+
+	}
+
+}
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java
index e634d9e953..0f9c2698dc 100644
--- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java
@@ -34,12 +34,13 @@
  */
 class KubernetesDiscoveryClientAutoConfigurationTests {
 
-	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
-					ReactiveCommonsClientAutoConfiguration.class, KubernetesDiscoveryClientAutoConfiguration.class));
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
+			AutoConfigurations.of(UtilAutoConfiguration.class, ReactiveCommonsClientAutoConfiguration.class,
+					KubernetesDiscoveryClientReactiveAutoConfiguration.class,
+					KubernetesDiscoveryClientBlockingAutoConfiguration.class));
 
 	@Test
-	public void shouldWorkWithDefaults() {
+	void shouldWorkWithDefaults() {
 		contextRunner
 				.withPropertyValues("spring.main.cloud-platform=KUBERNETES",
 						"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver")
@@ -51,7 +52,7 @@ public void shouldWorkWithDefaults() {
 	}
 
 	@Test
-	public void shouldNotHaveDiscoveryClientWhenDiscoveryDisabled() {
+	void shouldNotHaveDiscoveryClientWhenDiscoveryDisabled() {
 		contextRunner
 				.withPropertyValues("spring.cloud.discovery.enabled=false",
 						"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver")
@@ -63,7 +64,7 @@ public void shouldNotHaveDiscoveryClientWhenDiscoveryDisabled() {
 	}
 
 	@Test
-	public void shouldNotHaveDiscoveryClientWhenKubernetesDiscoveryDisabled() {
+	void shouldNotHaveDiscoveryClientWhenKubernetesDiscoveryDisabled() {
 		contextRunner
 				.withPropertyValues("spring.cloud.kubernetes.discovery.enabled=false",
 						"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver")
@@ -75,7 +76,7 @@ public void shouldNotHaveDiscoveryClientWhenKubernetesDiscoveryDisabled() {
 	}
 
 	@Test
-	public void shouldHaveReactiveDiscoveryClient() {
+	void shouldHaveReactiveDiscoveryClient() {
 		contextRunner
 				.withPropertyValues("spring.main.cloud-platform=KUBERNETES",
 						"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver")
@@ -87,7 +88,7 @@ public void shouldHaveReactiveDiscoveryClient() {
 	}
 
 	@Test
-	public void shouldNotHaveDiscoveryClientWhenReactiveDiscoveryDisabled() {
+	void shouldNotHaveDiscoveryClientWhenReactiveDiscoveryDisabled() {
 		contextRunner.withPropertyValues("spring.cloud.discovery.reactive.enabled=false").run(context -> {
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
@@ -95,7 +96,7 @@ public void shouldNotHaveDiscoveryClientWhenReactiveDiscoveryDisabled() {
 	}
 
 	@Test
-	public void shouldNotHaveDiscoveryClientWhenKubernetesDisabled() {
+	void shouldNotHaveDiscoveryClientWhenKubernetesDisabled() {
 		contextRunner.run(context -> {
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
@@ -103,7 +104,7 @@ public void shouldNotHaveDiscoveryClientWhenKubernetesDisabled() {
 	}
 
 	@Test
-	public void worksWithoutActuator() {
+	void worksWithoutActuator() {
 		contextRunner
 				.withPropertyValues("spring.main.cloud-platform=KUBERNETES",
 						"spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver")
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java
index 16c17404f7..6a81b48352 100644
--- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientTests.java
@@ -45,9 +45,55 @@
  */
 class KubernetesDiscoveryClientTests {
 
-	private static final String APPS = "[{\"name\":\"test-svc-1\",\"serviceInstances\":[{\"instanceId\":\"uid1\",\"serviceId\":\"test-svc-1\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"http\":\"8080\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]},{\"name\":\"test-svc-3\",\"serviceInstances\":[{\"instanceId\":\"uid2\",\"serviceId\":\"test-svc-3\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace2\",\"cluster\":null,\"scheme\":\"http\"}]}]";
-
-	private static final String APPS_NAME = "[{\"instanceId\":\"uid2\",\"serviceId\":\"test-svc-3\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace2\",\"cluster\":null,\"scheme\":\"http\"}]";
+	private static final String APPS = """
+				[{
+					"name": "test-svc-1",
+					"serviceInstances":
+						[{
+							"instanceId": "uid1",
+							"serviceId": "test-svc-1",
+							"host": "2.2.2.2",
+							"port": 8080,
+							"uri": "http://2.2.2.2:8080",
+							"secure": false,
+							"metadata":{"http": "8080"},
+							"namespace": "namespace1",
+							"cluster": null,
+							"scheme": "http"
+						}]
+					},
+					{
+						"name": "test-svc-3",
+						"serviceInstances":
+							[{
+								"instanceId": "uid2",
+								"serviceId": "test-svc-3",
+								"host": "2.2.2.2",
+								"port": 8080,
+								"uri": "http://2.2.2.2:8080",
+								"secure": false,
+								"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
+								"namespace": "namespace2",
+								"cluster":null,
+								"scheme":"http"
+							}]
+						}]
+			""";
+
+	private static final String APPS_NAME = """
+				[{
+					"instanceId": "uid2",
+					"serviceId": "test-svc-3",
+					"host": "2.2.2.2",
+					"port": 8080,
+					"uri": "http://2.2.2.2:8080",
+					"secure": false,
+					"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
+					"namespace": "namespace2",
+					"cluster": null,
+					"scheme": "http"
+				}]
+			""";
 
 	private static WireMockServer wireMockServer;
 
diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java
index 9f6adf6b4d..376ff2d422 100644
--- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java
+++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesReactiveDiscoveryClientTests.java
@@ -38,9 +38,55 @@
  */
 class KubernetesReactiveDiscoveryClientTests {
 
-	private static final String APPS = "[{\"name\":\"test-svc-1\",\"serviceInstances\":[{\"instanceId\":\"uid1\",\"serviceId\":\"test-svc-1\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"http\":\"8080\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]},{\"name\":\"test-svc-3\",\"serviceInstances\":[{\"instanceId\":\"uid2\",\"serviceId\":\"test-svc-3\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]}]";
+	private static final String APPS = """
+			[{
+				"name": "test-svc-1",
+				"serviceInstances":
+					[{
+						"instanceId": "uid1",
+						"serviceId": "test-svc-1",
+						"host": "2.2.2.2",
+						"port": 8080,
+						"uri": "http://2.2.2.2:8080",
+						"secure": false,
+						"metadata": {"http":"8080"},
+						"namespace": "namespace1",
+						"cluster": null,
+						"scheme": "http"
+					}]
+			},
+			{
+				"name": "test-svc-3",
+				"serviceInstances":
+					[{
+						"instanceId": "uid2",
+						"serviceId": "test-svc-3",
+						"host": "2.2.2.2",
+						"port": 8080,
+						"uri": "http://2.2.2.2:8080",
+						"secure": false,
+						"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
+						"namespace": "namespace1",
+						"cluster": null,
+						"scheme": "http"
+					}]
+			}]
+			""";
 
-	private static final String APPS_NAME = "[{\"instanceId\":\"uid2\",\"serviceId\":\"test-svc-3\",\"host\":\"2.2.2.2\",\"port\":8080,\"uri\":\"http://2.2.2.2:8080\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]";
+	private static final String APPS_NAME = """
+				[{
+					"instanceId": "uid2",
+					"serviceId": "test-svc-3",
+					"host": "2.2.2.2",
+					"port": 8080,
+					"uri": "http://2.2.2.2:8080",
+					"secure": false,
+					"metadata": {"spring": "true", "http": "8080", "k8s": "true"},
+					"namespace": "namespace1",
+					"cluster": null,
+					"scheme": "http"
+				}]
+			""";
 
 	private static WireMockServer wireMockServer;