diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java
index c90df1b0..d2a9d135 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java
@@ -47,6 +47,7 @@ import org.springframework.vault.client.VaultEndpoint;
 import org.springframework.vault.client.VaultEndpointProvider;
 import org.springframework.vault.config.ClientHttpRequestFactoryFactory;
 import org.springframework.vault.config.AbstractVaultConfiguration.ClientFactoryWrapper;
+import org.springframework.vault.core.VaultOperations;
 import org.springframework.vault.core.VaultTemplate;
 import org.springframework.vault.support.ClientOptions;
 import org.springframework.vault.support.SslConfiguration;
@@ -178,7 +179,7 @@ public class VaultBootstrapConfiguration implements InitializingBean {
 	 * @see #clientHttpRequestFactoryWrapper()
 	 */
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(VaultOperations.class)
 	public VaultTemplate vaultTemplate(SessionManager sessionManager) {
 		return new VaultTemplate(endpointProvider, clientHttpRequestFactoryWrapper()
 				.getClientHttpRequestFactory(), sessionManager);
diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java
similarity index 98%
rename from spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfiguration.java
rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java
index 3737f894..945e90c4 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfiguration.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java
@@ -74,7 +74,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 @ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class })
 @EnableConfigurationProperties({ VaultProperties.class })
 @Order(Ordered.LOWEST_PRECEDENCE - 10)
-public class ReactiveVaultBootstrapConfiguration {
+public class VaultReactiveBootstrapConfiguration {
 
 	private final VaultProperties vaultProperties;
 
@@ -82,7 +82,7 @@ public class ReactiveVaultBootstrapConfiguration {
 
 	private final ClientHttpConnector clientHttpConnector;
 
-	public ReactiveVaultBootstrapConfiguration(VaultProperties vaultProperties) {
+	public VaultReactiveBootstrapConfiguration(VaultProperties vaultProperties) {
 
 		this.vaultProperties = vaultProperties;
 		this.vaultEndpoint = getVaultEndpoint(vaultProperties);
@@ -160,7 +160,7 @@ public class ReactiveVaultBootstrapConfiguration {
 	 * @see #reactiveVaultSessionManager(BeanFactory, ObjectFactory)
 	 */
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(ReactiveVaultOperations.class)
 	public ReactiveVaultTemplate reactiveVaultTemplate(
 			ReactiveSessionManager tokenSupplier) {
 		return new ReactiveVaultTemplate(vaultEndpoint, clientHttpConnector,
diff --git a/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories b/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories
index 31d0a037..07417f13 100644
--- a/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories
@@ -5,5 +5,5 @@ org.springframework.cloud.vault.config.VaultHealthIndicatorAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 org.springframework.cloud.vault.config.DiscoveryClientVaultBootstrapConfiguration,\
 org.springframework.cloud.vault.config.VaultBootstrapConfiguration,\
-org.springframework.cloud.vault.config.ReactiveVaultBootstrapConfiguration,\
+org.springframework.cloud.vault.config.VaultReactiveBootstrapConfiguration,\
 org.springframework.cloud.vault.config.VaultBootstrapPropertySourceConfiguration
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
index 22c161cc..acf3c9b1 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
@@ -38,7 +38,7 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 /**
- * Tests for {@link ReactiveVaultBootstrapConfiguration}.
+ * Tests for {@link DiscoveryClientVaultBootstrapConfiguration}.
  *
  * @author Mark Paluch
  */
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
similarity index 95%
rename from spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java
rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
index 572ceea9..0ab4c3cb 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
@@ -35,11 +35,11 @@ import org.springframework.web.reactive.function.client.WebClient;
 import static org.assertj.core.api.Assertions.*;
 
 /**
- * Tests for {@link ReactiveVaultBootstrapConfiguration}.
+ * Tests for {@link VaultReactiveBootstrapConfiguration}.
  *
  * @author Mark Paluch
  */
-public class ReactiveVaultBootstrapConfigurationTests {
+public class VaultReactiveBootstrapConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -89,7 +89,7 @@ public class ReactiveVaultBootstrapConfigurationTests {
 		TestPropertyValues.of(environment).applyTo(ctx);
 
 		ctx.register(config);
-		ctx.register(ReactiveVaultBootstrapConfiguration.class);
+		ctx.register(VaultReactiveBootstrapConfiguration.class);
 		ctx.refresh();
 
 		this.context = ctx;