diff --git a/docker/pom.xml b/docker/pom.xml
index 96bb5842bb..3a25d39d10 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Docker Parent</description>
 
 	<properties>
-		<docker.registry.organization>spring-cloud</docker.registry.organization>
+		<docker.registry.organization>springcloud</docker.registry.organization>
 	</properties>
 
 	<modules>
diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml
index 138b3e2307..8742ac100b 100644
--- a/docker/spring-cloud-contract-docker/pom.xml
+++ b/docker/spring-cloud-contract-docker/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -53,25 +54,27 @@
 	<build>
 		<plugins>
 			<plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-dependency-plugin</artifactId>
-			  <version>3.0.0</version>
-			  <executions>
-			    <execution>
-			      <id>copy-dependencies</id>
-			      <phase>package</phase>
-			      <goals>
-			        <goal>copy-dependencies</goal>
-			      </goals>
-			      <configuration>
-			        <outputDirectory>${project.build.directory}/maven_dependencies</outputDirectory>
-			        <overWriteReleases>false</overWriteReleases>
-			        <overWriteSnapshots>true</overWriteSnapshots>
-			        <overWriteIfNewer>true</overWriteIfNewer>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/maven_dependencies
+							</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
 							<useRepositoryLayout>true</useRepositoryLayout>
-			      </configuration>
-			    </execution>
-			  </executions>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -92,23 +95,24 @@
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
-			  <artifactId>dockerfile-maven-plugin</artifactId>
-			  <version>1.3.7</version>
-			  <executions>
-			    <execution>
-			      <id>default</id>
-			      <goals>
-			        <goal>build</goal>
-			        <goal>push</goal>
-			      </goals>
-			    </execution>
-			  </executions>
-			  <configuration>
-			    <repository>${docker.registry.organization}/spring-cloud-contract</repository>
-			    <tag>${project.version}</tag>
-	        <username>${env.DOCKER_HUB_USERNAME}</username>
-	        <password>${env.DOCKER_HUB_PASSWORD}</password>
-			  </configuration>
+				<artifactId>dockerfile-maven-plugin</artifactId>
+				<version>1.3.7</version>
+				<executions>
+					<execution>
+						<id>default</id>
+						<goals>
+							<goal>build</goal>
+							<goal>push</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<repository>${docker.registry.organization}/spring-cloud-contract
+					</repository>
+					<tag>${project.version}</tag>
+					<username>${env.DOCKER_HUB_USERNAME}</username>
+					<password>${env.DOCKER_HUB_PASSWORD}</password>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
index a714d3217c..29cc15d80b 100644
--- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml
+++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -27,51 +28,55 @@
 	<build>
 		<plugins>
 			<plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-dependency-plugin</artifactId>
-			  <version>3.0.0</version>
-			  <executions>
-			    <execution>
-			      <id>copy-dependencies</id>
-			      <phase>package</phase>
-			      <goals>
-			        <goal>copy</goal>
-			      </goals>
-			      <configuration>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
 							<artifactItems>
-                <artifactItem>
+								<artifactItem>
 									<groupId>${project.groupId}</groupId>
-									<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
-                  <version>${project.version}</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/libs</outputDirectory>
-                  <destFileName>stub-runner-boot.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-			      </configuration>
-			    </execution>
-			  </executions>
+									<artifactId>spring-cloud-contract-stub-runner-boot
+									</artifactId>
+									<version>${project.version}</version>
+									<type>jar</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${project.build.directory}/libs
+									</outputDirectory>
+									<destFileName>stub-runner-boot.jar</destFileName>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
-			  <artifactId>dockerfile-maven-plugin</artifactId>
-			  <version>1.3.7</version>
-			  <executions>
-			    <execution>
-			      <id>default</id>
-			      <goals>
-			        <goal>build</goal>
-			        <goal>push</goal>
-			      </goals>
-			    </execution>
-			  </executions>
-			  <configuration>
-			    <repository>${docker.registry.organization}/spring-cloud-contract-stub-runner</repository>
-			    <tag>${project.version}</tag>
-	        <username>${env.DOCKER_HUB_USERNAME}</username>
-	        <password>${env.DOCKER_HUB_PASSWORD}</password>
-			  </configuration>
+				<artifactId>dockerfile-maven-plugin</artifactId>
+				<version>1.3.7</version>
+				<executions>
+					<execution>
+						<id>default</id>
+						<goals>
+							<goal>build</goal>
+							<goal>push</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<repository>
+						${docker.registry.organization}/spring-cloud-contract-stub-runner
+					</repository>
+					<tag>${project.version}</tag>
+					<username>${env.DOCKER_HUB_USERNAME}</username>
+					<password>${env.DOCKER_HUB_PASSWORD}</password>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/docs/src/main/asciidoc/verifier_setup.adoc b/docs/src/main/asciidoc/verifier_setup.adoc
index a72afcc4e8..a242a0a348 100644
--- a/docs/src/main/asciidoc/verifier_setup.adoc
+++ b/docs/src/main/asciidoc/verifier_setup.adoc
@@ -903,7 +903,7 @@ Spring Cloud Contract Verifier also generates tests with a guaranteed order of e
 [[docker-project]]
 === Docker Project
 
-We're publishing a `spring-cloud/spring-cloud-contract` Docker image
+We're publishing a `springcloud/spring-cloud-contract` Docker image
 that contains a project that will generate tests and execute them in `EXPLICIT` mode
 against a running application.
 
@@ -1031,7 +1031,7 @@ $ CURRENT_FOLDER_NAME=${PWD##*/}
 $ PROJECT_VERSION="0.0.1.RELEASE"
 
 # Execute contract tests
-$ docker run  --rm -e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" -e "PUBLISH_ARTIFACTS=true" -e "PROJECT_NAME=${CURRENT_FOLDER_NAME}" -e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" -e "PROJECT_VERSION=${PROJECT_VERSION}" -v "${CURRENT_DIR}/contracts/:/contracts:ro" -v "${CURRENT_DIR}/node_modules/spring-cloud-contract/output:/spring-cloud-contract-output/" spring-cloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
+$ docker run  --rm -e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" -e "PUBLISH_ARTIFACTS=true" -e "PROJECT_NAME=${CURRENT_FOLDER_NAME}" -e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" -e "PROJECT_VERSION=${PROJECT_VERSION}" -v "${CURRENT_DIR}/contracts/:/contracts:ro" -v "${CURRENT_DIR}/node_modules/spring-cloud-contract/output:/spring-cloud-contract-output/" springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
 
 # Kill app
 $ pkill -f "node app"
diff --git a/docs/src/main/asciidoc/verifier_stubrunner.adoc b/docs/src/main/asciidoc/verifier_stubrunner.adoc
index b867c771f8..ae74756044 100644
--- a/docs/src/main/asciidoc/verifier_stubrunner.adoc
+++ b/docs/src/main/asciidoc/verifier_stubrunner.adoc
@@ -155,7 +155,7 @@ $ STUBRUNNER_PORT="8083"
 $ STUBRUNNER_IDS="com.example:bookstore:0.0.1.RELEASE:stubs:9876"
 $ STUBRUNNER_REPOSITORY_ROOT="http://${APP_IP}:8081/artifactory/libs-release-local"
 # Run the docker with Stub Runner Boot
-$ docker run  --rm -e "STUBRUNNER_IDS=${STUBRUNNER_IDS}" -e "STUBRUNNER_REPOSITORY_ROOT=${STUBRUNNER_REPOSITORY_ROOT}" -p "${STUBRUNNER_PORT}:${STUBRUNNER_PORT}" -p "9876:9876" spring-cloud/spring-cloud-contract-stub-runner:"${SC_CONTRACT_DOCKER_VERSION}"
+$ docker run  --rm -e "STUBRUNNER_IDS=${STUBRUNNER_IDS}" -e "STUBRUNNER_REPOSITORY_ROOT=${STUBRUNNER_REPOSITORY_ROOT}" -p "${STUBRUNNER_PORT}:${STUBRUNNER_PORT}" -p "9876:9876" springcloud/spring-cloud-contract-stub-runner:"${SC_CONTRACT_DOCKER_VERSION}"
 ```
 
 What's happening is that