diff --git a/pom.xml b/pom.xml
index 048088ca..5ad062c1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -186,13 +186,13 @@
 							<goal>jar</goal>
 						</goals>
 					</execution>
-					<!--<execution>-->
-						<!--<id>aggregate</id>-->
-						<!--<phase>package</phase>-->
-						<!--<goals>-->
-							<!--<goal>aggregate</goal>-->
-						<!--</goals>-->
-					<!--</execution>-->
+					<execution>
+						<id>aggregate</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>aggregate</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/spring-cloud-task-docs/pom.xml b/spring-cloud-task-docs/pom.xml
index 8645e9ba..ea2618d2 100644
--- a/spring-cloud-task-docs/pom.xml
+++ b/spring-cloud-task-docs/pom.xml
@@ -118,7 +118,7 @@
 								<goals>
 									<goal>generate-html</goal>
 								</goals>
-								<phase>generate-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<htmlCustomization>${basedir}/src/main/docbook/xsl/html-singlepage.xsl</htmlCustomization>
 									<targetDirectory>${basedir}/target/docbook/htmlsingle</targetDirectory>
@@ -144,7 +144,7 @@
 								<goals>
 									<goal>generate-html</goal>
 								</goals>
-								<phase>generate-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<htmlCustomization>${basedir}/src/main/docbook/xsl/html-multipage.xsl</htmlCustomization>
 									<targetDirectory>${basedir}/target/docbook/html</targetDirectory>
@@ -171,7 +171,7 @@
 								<goals>
 									<goal>generate-pdf</goal>
 								</goals>
-								<phase>generate-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<foCustomization>${basedir}/src/main/docbook/xsl/pdf.xsl</foCustomization>
 									<targetDirectory>${basedir}/target/docbook/pdf</targetDirectory>
@@ -190,7 +190,7 @@
 								<goals>
 									<goal>generate-epub3</goal>
 								</goals>
-								<phase>generate-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<epubCustomization>${basedir}/src/main/docbook/xsl/epub.xsl</epubCustomization>
 									<targetDirectory>${basedir}/target/docbook/epub</targetDirectory>
diff --git a/spring-cloud-task-docs/src/main/assembly/assemble.xml b/spring-cloud-task-docs/src/main/assembly/assemble.xml
index 27aa7e20..02e0bfcf 100644
--- a/spring-cloud-task-docs/src/main/assembly/assemble.xml
+++ b/spring-cloud-task-docs/src/main/assembly/assemble.xml
@@ -12,8 +12,8 @@
 			<outputDirectory>/apidocs</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${project.build.directory}/docbook</directory>
-			<outputDirectory>/reference</outputDirectory>
+			<directory>${project.build.directory}/contents</directory>
+			<outputDirectory>/</outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>