diff --git a/pom.xml b/pom.xml
index ff19d32..fe1fd2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,11 +449,14 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<finalName>spring-credhub-${project.version}</finalName>
+						</configuration>
 						<executions>
 							<execution>
 								<id>aggregate-javadoc</id>
 								<goals>
-									<goal>aggregate</goal>
+									<goal>aggregate-jar</goal>
 								</goals>
 								<phase>package</phase>
 							</execution>
@@ -495,41 +498,22 @@
 									<goal>run</goal>
 								</goals>
 							</execution>
-
 							<execution>
-								<id>collect-schema-files</id>
-								<phase>process-resources</phase>
-								<configuration>
-									<target>
-										<copy todir="${project.build.directory}/schemas">
-											<fileset dir="${basedir}" erroronmissingdir="false">
-												<include name="**/src/main/resources/**/config/spring-*.xsd" />
-											</fileset>
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
+								<id>package-and-attach-docs-zip</id>
+								<phase>package</phase>
 								<goals>
 									<goal>run</goal>
 								</goals>
-							</execution>
-
-							<execution>
-								<id>rename-reference-docs</id>
-								<phase>process-resources</phase>
 								<configuration>
-									<target>
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf" />
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub" />
-									</target>
+									<tasks>
+										<zip destfile="${project.build.directory}/spring-credhub-${project.version}.zip">
+											<zipfileset src="${project.build.directory}/spring-credhub-${project.version}-javadoc.jar" prefix="api" />
+											<!--<fileset dir="${project.build.directory}/content"/>-->
+										</zip>
+									</tasks>
 								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
 							</execution>
-
 						</executions>
-
 					</plugin>
 
 				</plugins>
@@ -570,20 +554,7 @@
 						<plugin>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctor-maven-plugin</artifactId>
-							<dependencies>
-								<dependency>
-									<groupId>org.asciidoctor</groupId>
-									<artifactId>asciidoctorj-pdf</artifactId>
-									<version>1.5.0-alpha.11</version>
-								</dependency>
-								<dependency>
-									<groupId>org.asciidoctor</groupId>
-									<artifactId>asciidoctorj-epub3</artifactId>
-									<version>1.5.0-alpha.6</version>
-								</dependency>
-							</dependencies>
 							<executions>
-
 								<execution>
 									<id>html</id>
 									<phase>generate-resources</phase>
@@ -593,7 +564,6 @@
 									<configuration>
 										<backend>html5</backend>
 										<outputDirectory>${project.root}/target/site/reference/html</outputDirectory>
-										<sectids>false</sectids>
 										<sourceHighlighter>prettify</sourceHighlighter>
 										<attributes>
 											<linkcss>true</linkcss>
@@ -603,31 +573,6 @@
 										</attributes>
 									</configuration>
 								</execution>
-
-								<execution>
-									<id>epub</id>
-									<phase>generate-resources</phase>
-									<goals>
-										<goal>process-asciidoc</goal>
-									</goals>
-									<configuration>
-										<backend>epub3</backend>
-										<sourceHighlighter>coderay</sourceHighlighter>
-									</configuration>
-								</execution>
-
-								<execution>
-									<id>pdf</id>
-									<phase>generate-resources</phase>
-									<goals>
-										<goal>process-asciidoc</goal>
-									</goals>
-									<configuration>
-										<backend>pdf</backend>
-										<sourceHighlighter>coderay</sourceHighlighter>
-									</configuration>
-								</execution>
-
 							</executions>
 
 							<configuration>
@@ -648,45 +593,6 @@
 						</plugin>
 
 						<!--
-							Creates two zip files for download as well as API and reference documentation distribution.
-						-->
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-assembly-plugin</artifactId>
-							<executions>
-								<execution>
-									<id>static</id>
-									<goals>
-										<goal>single</goal>
-									</goals>
-									<phase>prepare-package</phase>
-									<configuration>
-										<descriptors>
-											<descriptor>${shared.resources}/assemblies/static-resources.xml</descriptor>
-										</descriptors>
-										<finalName>static-resources</finalName>
-										<appendAssemblyId>false</appendAssemblyId>
-									</configuration>
-								</execution>
-								<execution>
-									<id>docs</id>
-									<goals>
-										<goal>single</goal>
-									</goals>
-									<phase>package</phase>
-									<configuration>
-										<descriptors>
-											<descriptor>src/assembly/docs.xml</descriptor>
-										</descriptors>
-										<finalName>spring-credhub-${project.version}-docs</finalName>
-										<appendAssemblyId>false</appendAssemblyId>
-										<classifier>docs</classifier>
-										<attach>true</attach>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
-
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-deploy-plugin</artifactId>
@@ -695,6 +601,7 @@
 								<uniqueVersion>false</uniqueVersion>
 							</configuration>
 						</plugin>
+						-->
 					</plugins>
 				</pluginManagement>
 			</build>