diff --git a/pom.xml b/pom.xml
index 90b417f9..72231a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,17 @@
 		<spring-boot.version>2.2.0.M4</spring-boot.version>
 		<spring-cloud-build.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
+		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
 		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions.version>0.1.0.RELEASE
+		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
 		</spring-asciidoctor-extensions.version>
-		<asciidoctorj-pdf.version>1.5.0-alpha.16</asciidoctorj-pdf.version>
+		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>1.5.18</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
 		<guides-update.phase>deploy</guides-update.phase>
+		<revision>${project.version}</revision>
+		<asciidoctorj.version>1.5.8</asciidoctorj.version>
+		<jruby-complete.version>9.2.7.0</jruby-complete.version>
 
 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -954,7 +958,7 @@
 												<version>${spring-doc-resources.version}</version>
 												<type>zip</type>
 												<overWrite>true</overWrite>
-												<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
+												<outputDirectory>${refdocs.build.directory}</outputDirectory>
 											</artifactItem>
 										</artifactItems>
 									</configuration>
@@ -1007,7 +1011,23 @@
 								</dependency>
 							</dependencies>
 							<configuration>
-								<sourceDirectory>${project.build.directory}/refdocs/</sourceDirectory>
+								<sourceDirectory>${refdocs.build.directory}</sourceDirectory>
+								<resources>
+									<resource>
+										<directory>${refdocs.build.directory}</directory>
+										<excludes>
+											<exclude>**/*.*adoc</exclude>
+										</excludes>
+									</resource>
+								</resources>
+								<attributes>
+									<sources-root>${project.basedir}/src</sources-root>
+									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
+									<generated-resources-root>${project.basedir}/target/generated-resources</generated-resources-root>
+									<github-tag>${github-tag}</github-tag>
+									<version-type>${version-type}</version-type>
+									<version>${project.version}</version>
+								</attributes>
 								<requires>
 									<require>asciidoctor-diagram</require>
 								</requires>
@@ -1021,34 +1041,96 @@
 									</goals>
 									<configuration>
 										<backend>html5</backend>
+										<sourceDocumentExtensions>
+											<sourceDocumentExtension>adoc</sourceDocumentExtension>
+											<sourceDocumentExtension>htmladoc</sourceDocumentExtension>
+										</sourceDocumentExtensions>
+										<outputDirectory>${project.build.directory}/generated-docs/reference/html</outputDirectory>
 										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
-											// these attributes are required to use the doc resources
-											<docinfo>shared</docinfo>
-											<stylesdir>css/</stylesdir>
-											<stylesheet>spring.css</stylesheet>
-											<linkcss>true</linkcss>
-											<icons>font</icons>
 											<highlightjsdir>js/highlight</highlightjsdir>
 											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
+											<linkcss>true</linkcss>
+											<imagesdir>./images</imagesdir>
+											<icons>font</icons>
+											<stylesdir>css/</stylesdir>
+											<stylesheet>spring.css</stylesheet>
+											<attribute-missing>warn</attribute-missing>
+
+											<!-- Spring Cloud specific -->
 											<allow-uri-read>true</allow-uri-read>
 											<nofooter/>
-											<toc>left</toc>
-											<toc-levels>4</toc-levels>
 											<spring-cloud-version>${project.version}</spring-cloud-version>
-											<sectlinks>true</sectlinks>
+											<project-docs-version>${revision}</project-docs-version>
+											<project-version>${project.version}</project-version>
+											<github-tag>${github-tag}</github-tag>
+										</attributes>
+										<logHandler>
+											<outputToConsole>true</outputToConsole>
+											<failIf>
+<!--												<severity>DEBUG</severity>-->
+											</failIf>
+										</logHandler>
+									</configuration>
+								</execution>
+								<execution>
+									<id>generate-htmlsingle-documentation</id>
+									<phase>prepare-package</phase>
+									<goals>
+										<goal>process-asciidoc</goal>
+									</goals>
+									<configuration>
+										<backend>html5</backend>
+										<sourceDocumentExtensions>
+											<sourceDocumentExtension>htmlsingleadoc</sourceDocumentExtension>
+										</sourceDocumentExtensions>
+										<outputDirectory>${project.build.directory}/generated-docs/reference/htmlsingle</outputDirectory>
+										<sourceHighlighter>highlight.js</sourceHighlighter>
+										<doctype>book</doctype>
+										<attributes>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
+											<linkcss>true</linkcss>
+											<imagesdir>./images</imagesdir>
+											<icons>font</icons>
+											<stylesdir>css/</stylesdir>
+											<stylesheet>spring.css</stylesheet>
+
+											<!-- Spring Cloud specific -->
+											<allow-uri-read>true</allow-uri-read>
+											<nofooter/>
+											<spring-cloud-version>${project.version}</spring-cloud-version>
+											<project-docs-version>${revision}</project-docs-version>
+											<project-version>${project.version}</project-version>
+											<github-tag>${github-tag}</github-tag>
 										</attributes>
 									</configuration>
 								</execution>
+								<execution>
+									<id>generate-pdf-documentation</id>
+									<phase>prepare-package</phase>
+									<goals>
+										<goal>process-asciidoc</goal>
+									</goals>
+									<configuration>
+										<backend>pdf</backend>
+										<sourceDocumentExtensions>
+											<sourceDocumentExtension>pdfadoc</sourceDocumentExtension>
+										</sourceDocumentExtensions>
+										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf</outputDirectory>
+										<resources>
+											<resource>
+												<directory>${refdocs.build.directory}</directory>
+												<excludes>
+													<exclude>**/*</exclude>
+												</excludes>
+											</resource>
+										</resources>
+									</configuration>
+								</execution>
 							</executions>
 						</plugin>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>${build-helper-maven-plugin.version}</version>
-							<inherited>false</inherited>
-						</plugin>
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-antrun-plugin</artifactId>
@@ -1078,12 +1160,12 @@
 								<dependency>
 									<groupId>org.jruby</groupId>
 									<artifactId>jruby-complete</artifactId>
-									<version>1.7.17</version>
+									<version>${jruby-complete.version}</version>
 								</dependency>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
 									<artifactId>asciidoctorj</artifactId>
-									<version>1.5.8</version>
+									<version>${asciidoctorj.version}</version>
 								</dependency>
 							</dependencies>
 							<executions>
@@ -1126,6 +1208,25 @@
 										</target>
 									</configuration>
 								</execution>
+								<execution>
+									<id>package-and-attach-docs-zip</id>
+									<phase>package</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<target>
+											<zip
+													destfile="${project.build.directory}/${project.artifactId}-${revision}.zip">
+												<!--<zipfileset
+														src="${project.build.directory}/${project.artifactId}-${revision}-javadoc.jar"
+														prefix="api" />-->
+<!--												<fileset dir="${project.build.directory}/contents"/>-->
+												<fileset dir="${project.build.directory}/generated-docs"/>
+											</zip>
+										</target>
+									</configuration>
+								</execution>
 								<execution>
 									<id>setup-maven-properties</id>
 									<phase>validate</phase>
@@ -1135,48 +1236,54 @@
 									<configuration>
 										<exportAntProperties>true</exportAntProperties>
 										<target>
-											<taskdef
-													resource="net/sf/antcontrib/antcontrib.properties"/>
-											<taskdef name="stringutil"
-													 classname="ise.antelope.tasks.StringUtilTask"/>
-											<var name="version-type"
-												 value="${project.version}"/>
-											<propertyregex property="version-type"
-														   override="true"
-														   input="${version-type}"
-														   regexp=".*\.(.*)"
-														   replace="\1"/>
-											<propertyregex property="version-type"
-														   override="true"
-														   input="${version-type}"
-														   regexp="(M)\d+"
+											<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+											<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask"/>
+											<var name="version-type" value="${revision}"/>
+											<propertyregex property="version-type" override="true"
+														   input="${version-type}" regexp=".*\.(.*)" replace="\1"/>
+											<propertyregex property="version-type" override="true"
+														   input="${version-type}" regexp="(M)\d+" replace="MILESTONE"/>
+											<propertyregex property="version-type" override="true"
+														   input="${version-type}" regexp="(RC)\d+"
 														   replace="MILESTONE"/>
-											<propertyregex property="version-type"
-														   override="true"
-														   input="${version-type}"
-														   regexp="(RC)\d+"
-														   replace="MILESTONE"/>
-											<propertyregex property="version-type"
-														   override="true"
-														   input="${version-type}"
-														   regexp="BUILD-(.*)"
+											<propertyregex property="version-type" override="true"
+														   input="${version-type}" regexp="BUILD-(.*)"
 														   replace="SNAPSHOT"/>
-											<stringutil string="${version-type}"
-														property="spring-cloud-repo">
+											<stringutil string="${version-type}" property="spring-boot-repo">
 												<lowercase/>
 											</stringutil>
-											<var name="github-tag"
-												 value="v${project.version}"/>
-											<propertyregex property="github-tag"
-														   override="true"
-														   input="${github-tag}"
-														   regexp=".*SNAPSHOT"
-														   replace="master"/>
+											<var name="github-tag" value="v${revision}"/>
+											<propertyregex property="github-tag" override="true"
+														   input="${github-tag}" regexp=".*SNAPSHOT" replace="master"/>
 										</target>
 									</configuration>
 								</execution>
 							</executions>
 						</plugin>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>build-helper-maven-plugin</artifactId>
+							<version>${build-helper-maven-plugin.version}</version>
+							<inherited>false</inherited>
+							<executions>
+								<execution>
+									<id>attach-zip</id>
+									<goals>
+										<goal>attach-artifact</goal>
+									</goals>
+									<configuration>
+										<artifacts>
+											<artifact>
+												<file>
+													${project.build.directory}/${project.artifactId}-${project.version}.zip
+												</file>
+												<type>zip</type>
+											</artifact>
+										</artifacts>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>