diff --git a/README.adoc b/README.adoc
index 19fece43..47ac0fba 100644
--- a/README.adoc
+++ b/README.adoc
@@ -10,20 +10,20 @@ Spring Cloud Vault Config provides client-side support for externalized configur
 Specifically for Spring applications:
 
 * Retrieve secrets from Vault and initialize Spring Environment with remote property sources
-* Obtain http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.generic[secrets] secured with SSL
+* Obtain http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.generic[secrets] secured with SSL
 * Generate credentials for
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.mysql[MySQL],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.postgresql[PostgreSQL],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.cassandra[Apache Cassandra],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.mongodb[MongoDB],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.consul[Consul],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.aws[AWS], and http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.rabbitmq[RabbitMQ].
-* http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.token[Token],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.appid[AppId],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.approle[AppRole],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.clientcert[Client Certificate],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.cubbyhole[Cubbyhole], and
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.awsec2[AWS-EC2] authentication
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.mysql[MySQL],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.postgresql[PostgreSQL],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.cassandra[Apache Cassandra],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.mongodb[MongoDB],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.consul[Consul],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.aws[AWS], and http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.rabbitmq[RabbitMQ].
+* http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.token[Token],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.appid[AppId],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.approle[AppRole],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.clientcert[Client Certificate],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.cubbyhole[Cubbyhole], and
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.awsec2[AWS-EC2] authentication
 * Bootstrap application context: a parent context for the main application that can be trained to do anything
 
 
@@ -230,7 +230,7 @@ property `health.vault.enabled` (default `true`)
 
 Vault requires an https://www.vaultproject.io/docs/concepts/auth.html[authentication mechanism] to https://www.vaultproject.io/docs/concepts/tokens.html[authorize client requests].
 
-Spring Cloud Vault Config supports multiple http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication[authentication mechanisms] to authenticate applications with Vault.
+Spring Cloud Vault Config supports multiple http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication[authentication mechanisms] to authenticate applications with Vault.
 
 For a quickstart, use the root token printed by the <<quickstart.vault.start,Vault initialization>>.
 
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index ea881324..edd0b1e3 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -8,20 +8,20 @@ include::intro.adoc[]
 Specifically for Spring applications:
 
 * Retrieve secrets from Vault and initialize Spring Environment with remote property sources
-* Obtain http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.generic[secrets] secured with SSL
+* Obtain http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.generic[secrets] secured with SSL
 * Generate credentials for
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.mysql[MySQL],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.postgresql[PostgreSQL],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.cassandra[Apache Cassandra],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.mongodb[MongoDB],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.consul[Consul],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.aws[AWS], and http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.backends.rabbitmq[RabbitMQ].
-* http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.token[Token],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.appid[AppId],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.approle[AppRole],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.clientcert[Client Certificate],
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.cubbyhole[Cubbyhole], and
-http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication.awsec2[AWS-EC2] authentication
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.mysql[MySQL],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.postgresql[PostgreSQL],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.cassandra[Apache Cassandra],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.mongodb[MongoDB],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.consul[Consul],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.aws[AWS], and http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.backends.rabbitmq[RabbitMQ].
+* http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.token[Token],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.appid[AppId],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.approle[AppRole],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.clientcert[Client Certificate],
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.cubbyhole[Cubbyhole], and
+http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication.awsec2[AWS-EC2] authentication
 * Bootstrap application context: a parent context for the main application that can be trained to do anything
 
 
diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc
index fe6f1d95..8f9118d2 100644
--- a/docs/src/main/asciidoc/quickstart.adoc
+++ b/docs/src/main/asciidoc/quickstart.adoc
@@ -199,7 +199,7 @@ property `health.vault.enabled` (default `true`)
 
 Vault requires an https://www.vaultproject.io/docs/concepts/auth.html[authentication mechanism] to https://www.vaultproject.io/docs/concepts/tokens.html[authorize client requests].
 
-Spring Cloud Vault Config supports multiple http://cloud.spring.io/spring-cloud-vault-config/spring-cloud-vault-config.html#vault.config.authentication[authentication mechanisms] to authenticate applications with Vault.
+Spring Cloud Vault Config supports multiple http://cloud.spring.io/spring-cloud-vault/spring-cloud-vault-config.html#vault.config.authentication[authentication mechanisms] to authenticate applications with Vault.
 
 For a quickstart, use the root token printed by the <<quickstart.vault.start,Vault initialization>>.
 
diff --git a/pom.xml b/pom.xml
index 2f7542cd..39dac4b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
 	</modules>
 
 	<scm>
-		<url>https://github.com/spring-cloud/spring-cloud-vault-config</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-vault-config.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-vault-config.git
+		<url>https://github.com/spring-cloud/spring-cloud-vault</url>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-vault.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-vault.git
 		</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml
index 7d3a5d4b..edbd54bd 100644
--- a/spring-cloud-starter-vault-config/pom.xml
+++ b/spring-cloud-starter-vault-config/pom.xml
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Starter Vault Config</name>
 	<description>Starter for exposing Spring Cloud Vault Config</description>
 
-	<url>http://cloud.spring.io/spring-cloud-vault-config/</url>
+	<url>http://cloud.spring.io/spring-cloud-vault/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
 		<url>http://www.spring.io</url>