diff --git a/pom.xml b/pom.xml
index f808ed61..cf8c11be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
 		<httpcore.version>4.4.9</httpcore.version>
 		<netty.version>4.1.30.Final</netty.version>
 		<okhttp3.version>3.10.0</okhttp3.version>
+		<bcpkix-jdk15on.version>1.62</bcpkix-jdk15on.version>
 
 		<google-api-services-iam.version>v1-rev259-1.25.0
 		</google-api-services-iam.version>
@@ -112,6 +113,15 @@
 				<version>${netty.version}</version>
 			</dependency>
 
+			<!-- BouncyCastle -->
+
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcpkix-jdk15on</artifactId>
+				<version>${bcpkix-jdk15on.version}</version>
+				<optional>true</optional>
+			</dependency>
+
 			<!-- GCP SDK -->
 			<dependency>
 				<groupId>com.google.apis</groupId>
diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml
index 46a4aade..68e0c0b4 100644
--- a/spring-cloud-vault-config/pom.xml
+++ b/spring-cloud-vault-config/pom.xml
@@ -42,7 +42,7 @@
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-core</artifactId>
 			<optional>true</optional>
-			<version>1.11.345</version>
+			<version>1.11.627</version>
 			<exclusions>
 				<exclusion>
 					<groupId>software.amazon.ion</groupId>
@@ -55,6 +55,12 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpkix-jdk15on</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.apis</groupId>
 			<artifactId>google-api-services-iam</artifactId>
diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
index 2574cb63..9247f1b0 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
@@ -49,8 +49,8 @@ import org.springframework.vault.core.lease.SecretLeaseContainer;
  */
 @Configuration
 @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true)
-@EnableConfigurationProperties({ VaultGenericBackendProperties.class,
-		VaultKeyValueBackendProperties.class })
+@EnableConfigurationProperties({VaultGenericBackendProperties.class,
+		VaultKeyValueBackendProperties.class})
 @Order(Ordered.LOWEST_PRECEDENCE - 10)
 public class VaultBootstrapPropertySourceConfiguration implements InitializingBean {
 
@@ -158,20 +158,9 @@ public class VaultBootstrapPropertySourceConfiguration implements InitializingBe
 						keyValueBackend, Arrays.asList(this.applicationContext
 								.getEnvironment().getActiveProfiles()));
 
-				if (keyValueBackend instanceof VaultKeyValueBackendProperties
-						&& ((VaultKeyValueBackendProperties) keyValueBackend)
-								.getBackendVersion() == 2) {
-
-					for (String context : contexts) {
-						secretBackendConfigurer.add(KeyValueSecretBackendMetadata
-								.create(keyValueBackend.getBackend(), context));
-					}
-				}
-				else {
-					for (String context : contexts) {
-						secretBackendConfigurer.add(GenericSecretBackendMetadata
-								.create(keyValueBackend.getBackend(), context));
-					}
+				for (String context : contexts) {
+					secretBackendConfigurer.add(GenericSecretBackendMetadata
+							.create(keyValueBackend.getBackend(), context));
 				}
 			}
 
diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml
index 4c19b2b1..c17479b1 100644
--- a/spring-cloud-vault-dependencies/pom.xml
+++ b/spring-cloud-vault-dependencies/pom.xml
@@ -20,7 +20,7 @@
 	<description>Spring Cloud Vault Dependencies</description>
 
 	<properties>
-		<spring-vault.version>2.1.3.RELEASE</spring-vault.version>
+		<spring-vault.version>2.2.0.BUILD-SNAPSHOT</spring-vault.version>
 	</properties>
 
 	<dependencyManagement>