diff --git a/README.adoc b/README.adoc
index 6a66bdce..2da0f5a0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -282,22 +282,21 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId> <6>
 					</plugin>
-                                        <plugin>
-                                                <groupId>org.codehaus.mojo</groupId>
-                                                <artifactId>build-helper-maven-plugin</artifactId> <7>
-                                        </plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId> <7>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
+<1> This plugin downloads sets up all the git information of the project
 <2> This plugin downloads the resources of the `spring-cloud-build-docs` module
 <3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
-<7> This plugin ensures that the generated zip docs are attached as an artifact and will get published
+<7> This plugin ensures that the generated zip docs will get published
 
 IMPORTANT: The order of plugin declaration is important!
 
@@ -344,8 +343,8 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 	<version-type>${version-type}@</version-type>
 	<!-- Once we go to docs.spring.io should be changed to -->
 	<!-- https://docs.spring.io/${docs.main}/${project.version} -->
-	<docs-url>${docs-url}@</docs-url>
-	<raw-docs-url>${raw-docs-url}@</raw-docs-url>
+	<docs-url>https://docs.spring.io/${docs.main}/${project.version}@</docs-url>
+	<raw-docs-url>${github-raw}@</raw-docs-url>
 	<project-version>${project.version}@</project-version>
 	<project-name>${docs.main}@</project-name>
 </attributes>
diff --git a/docs/pom.xml b/docs/pom.xml
index 50f5da67..c581773e 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -246,6 +246,9 @@
 	<profiles>
 		<profile>
 			<id>docs</id>
+			<properties>
+				<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/pom.xml b/pom.xml
index 238b10d0..8652262d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
 		<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
 		<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
 		<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
+		<upload-docs-zip.phase>none</upload-docs-zip.phase>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -1381,7 +1382,7 @@
 							<executions>
 								<execution>
 									<id>upload-docs-zip</id>
-									<phase>deploy</phase>
+									<phase>${upload-docs-zip.phase}</phase>
 									<goals>
 										<goal>deploy-file</goal>
 									</goals>