diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index e45a36d4c4..0000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Code of Conduct
-
-It is expected you apply the Golden rule in any interaction you will have with 
-one another, or in other words: "One should treat others as one would like others
-to treat oneself".
-
diff --git a/arquillian/managed/pom.xml b/arquillian/managed/pom.xml
index 608544456d..246354f93d 100644
--- a/arquillian/managed/pom.xml
+++ b/arquillian/managed/pom.xml
@@ -74,4 +74,10 @@
             <artifactId>arquillian-testenricher-initialcontext</artifactId>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/arquillian/managed/</url>
+        </site>
+    </distributionManagement>   
 </project>
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index 19f839b74d..3457083d39 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Arquillian - Project</name>
+    <name>Piranha - Arquillian</name>
     <description>
         The Piranha Arquillian Project delivers you with Arquillian support.
     </description>
@@ -52,4 +52,10 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/arquillian/</url>
+        </site>
+    </distributionManagement>   
 </project>
diff --git a/arquillian/server/pom.xml b/arquillian/server/pom.xml
index e661765ede..801cda2fe0 100644
--- a/arquillian/server/pom.xml
+++ b/arquillian/server/pom.xml
@@ -117,7 +117,12 @@
             </plugin>
         </plugins>
     </build>
-
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/arquillian/server/</url>
+        </site>
+    </distributionManagement>   
     <profiles>
         <profile>
             <id>release</id>
diff --git a/bom/pom.xml b/bom/pom.xml
index 64a02074db..7a00416325 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -226,4 +226,10 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/bom/</url>
+        </site>
+    </distributionManagement>       
 </project>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index dfd9b3cc44..4da2bf47b5 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -28,4 +28,11 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/core/api/</url>
+        </site>
+    </distributionManagement>       
 </project>
diff --git a/core/impl/pom.xml b/core/impl/pom.xml
index b4fb233a78..e5debddb6b 100644
--- a/core/impl/pom.xml
+++ b/core/impl/pom.xml
@@ -62,4 +62,10 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/core/impl/</url>
+        </site>
+    </distributionManagement>       
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index e6e2a81c7c..510407c0d6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Core - Project</name>
+    <name>Piranha - Core</name>
 
     <modules>
         <module>api</module>
@@ -49,4 +49,11 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/core/</url>
+        </site>
+    </distributionManagement>       
 </project>
diff --git a/dist/coreprofile/pom.xml b/dist/coreprofile/pom.xml
index afc992c75d..cb0c8076f4 100644
--- a/dist/coreprofile/pom.xml
+++ b/dist/coreprofile/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>piranha-dist-coreprofile</artifactId>
     <packaging>jar</packaging>
 
-    <name>Piranha - Distribution - CoreProfile</name>
+    <name>Piranha - Distribution - Core Profile</name>
 
     <dependencies>
         <!-- compile -->
@@ -69,7 +69,12 @@
             </plugin>
         </plugins>
     </build>
-
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/coreprofile/</url>
+        </site>
+    </distributionManagement>
     <profiles>
         <profile>
             <id>docker</id>
@@ -132,4 +137,17 @@
             </build>
         </profile>
     </profiles>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports/>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/src/site/markdown/coreprofile/create_a_json_rest_service.md b/dist/coreprofile/src/site/markdown/create_a_json_rest_service.md
similarity index 100%
rename from src/site/markdown/coreprofile/create_a_json_rest_service.md
rename to dist/coreprofile/src/site/markdown/create_a_json_rest_service.md
diff --git a/src/site/markdown/coreprofile/create_a_rest_service.md b/dist/coreprofile/src/site/markdown/create_a_rest_service.md
similarity index 100%
rename from src/site/markdown/coreprofile/create_a_rest_service.md
rename to dist/coreprofile/src/site/markdown/create_a_rest_service.md
diff --git a/src/site/markdown/coreprofile/debugging_a_rest_service_with_netbeans.md b/dist/coreprofile/src/site/markdown/debugging_a_rest_service_with_netbeans.md
similarity index 100%
rename from src/site/markdown/coreprofile/debugging_a_rest_service_with_netbeans.md
rename to dist/coreprofile/src/site/markdown/debugging_a_rest_service_with_netbeans.md
diff --git a/src/site/markdown/coreprofile/debugging_a_rest_service_with_vscode.md b/dist/coreprofile/src/site/markdown/debugging_a_rest_service_with_vscode.md
similarity index 100%
rename from src/site/markdown/coreprofile/debugging_a_rest_service_with_vscode.md
rename to dist/coreprofile/src/site/markdown/debugging_a_rest_service_with_vscode.md
diff --git a/src/site/markdown/coreprofile/index.md b/dist/coreprofile/src/site/markdown/index.md
similarity index 100%
rename from src/site/markdown/coreprofile/index.md
rename to dist/coreprofile/src/site/markdown/index.md
diff --git a/src/site/markdown/coreprofile/testing_with_junit5_and_arquillian.md b/dist/coreprofile/src/site/markdown/testing_with_junit5_and_arquillian.md
similarity index 100%
rename from src/site/markdown/coreprofile/testing_with_junit5_and_arquillian.md
rename to dist/coreprofile/src/site/markdown/testing_with_junit5_and_arquillian.md
diff --git a/src/site/markdown/coreprofile/using_project_crac.md b/dist/coreprofile/src/site/markdown/using_project_crac.md
similarity index 100%
rename from src/site/markdown/coreprofile/using_project_crac.md
rename to dist/coreprofile/src/site/markdown/using_project_crac.md
diff --git a/dist/coreprofile/src/site/site.xml b/dist/coreprofile/src/site/site.xml
new file mode 100644
index 0000000000..c7eb2f273f
--- /dev/null
+++ b/dist/coreprofile/src/site/site.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project 
+    xmlns="http://maven.apache.org/DECORATION/1.8.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+    <body>
+        <menu name="Core Profile">
+            <item name="Introduction" href="index.html"/>
+            <item name="Create a REST service" href="create_a_rest_service.html"/>
+            <item name="Create a JSON REST service" href="create_a_json_rest_service.html"/>
+            <item name="Debugging a REST service with NetBeans" href="debugging_a_rest_service_with_netbeans.html"/>
+            <item name="Debugging a REST service with VSCode" href="debugging_a_rest_service_with_vscode.html"/>
+            <item name="Testing with JUnit 5 and Arquillian" href="testing_with_junit5_and_arquillian.html"/>
+            <item name="Using Project CRaC" href="using_project_crac.html"/>
+        </menu>
+    </body>
+    <custom>
+        <fluidoSkin>
+            <copyrightClass>pull-right</copyrightClass>
+            <gitHub>
+                <projectId>piranhacloud/piranha</projectId>
+                <ribbonOrientation>left-bottom</ribbonOrientation>
+                <ribbonColor>black</ribbonColor>
+            </gitHub>
+            <twitter>
+                <user>piranha_cloud</user>
+            </twitter>
+        </fluidoSkin>
+    </custom>
+    <poweredBy>
+        <logo/>
+    </poweredBy>
+    <publishDate position="right"/>
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>2.0.0</version>
+    </skin>
+    <version position="left"/>
+</project>
\ No newline at end of file
diff --git a/dist/isolated/pom.xml b/dist/isolated/pom.xml
index d786cc729d..226298ea12 100644
--- a/dist/isolated/pom.xml
+++ b/dist/isolated/pom.xml
@@ -184,6 +184,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/isolated/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/dist/micro/pom.xml b/dist/micro/pom.xml
index c3cdeb2b82..d5ce64aced 100644
--- a/dist/micro/pom.xml
+++ b/dist/micro/pom.xml
@@ -230,6 +230,13 @@
             </plugin>
         </plugins>
     </build>
+    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/micro/</url>
+        </site>
+    </distributionManagement>
 
     <profiles>
         <profile>
diff --git a/dist/microprofile/pom.xml b/dist/microprofile/pom.xml
index b24bafc4d5..d10026d1ab 100644
--- a/dist/microprofile/pom.xml
+++ b/dist/microprofile/pom.xml
@@ -102,6 +102,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/microprofile/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/dist/platform/pom.xml b/dist/platform/pom.xml
index 49d950fb67..5a140caf27 100644
--- a/dist/platform/pom.xml
+++ b/dist/platform/pom.xml
@@ -124,6 +124,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/platform/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/dist/pom.xml b/dist/pom.xml
index eff8370a31..7685f689b0 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Distribution - Project</name>
+    <name>Piranha - Distribution</name>
 
     <modules>
         <module>coreprofile</module>
@@ -44,4 +44,11 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/</url>
+        </site>
+    </distributionManagement>    
 </project>
diff --git a/dist/server/pom.xml b/dist/server/pom.xml
index 46458ee4a6..eb1ae18a22 100644
--- a/dist/server/pom.xml
+++ b/dist/server/pom.xml
@@ -116,6 +116,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/server/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/dist/servlet/pom.xml b/dist/servlet/pom.xml
index ff0ae917ab..c05c01fbf7 100644
--- a/dist/servlet/pom.xml
+++ b/dist/servlet/pom.xml
@@ -71,6 +71,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/servlet/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/dist/webprofile/pom.xml b/dist/webprofile/pom.xml
index 1d73009e96..37b4a8d3e5 100644
--- a/dist/webprofile/pom.xml
+++ b/dist/webprofile/pom.xml
@@ -101,6 +101,13 @@
         </plugins>
     </build>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/dist/webprofile/</url>
+        </site>
+    </distributionManagement>
+
     <profiles>
         <profile>
             <id>docker</id>
diff --git a/embedded/pom.xml b/embedded/pom.xml
index c96110d30d..56d6fef091 100644
--- a/embedded/pom.xml
+++ b/embedded/pom.xml
@@ -99,4 +99,25 @@
             </plugin>
         </plugins>
     </build>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/embedded/</url>
+        </site>
+    </distributionManagement>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependency-info</report>                        
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/src/site/markdown/embedded/create_a_hello_world_web_application.md b/embedded/src/site/markdown/create_a_hello_world_web_application.md
similarity index 100%
rename from src/site/markdown/embedded/create_a_hello_world_web_application.md
rename to embedded/src/site/markdown/create_a_hello_world_web_application.md
diff --git a/src/site/markdown/embedded/create_a_piranha_embedded_graalvm_application.md b/embedded/src/site/markdown/create_a_piranha_embedded_graalvm_application.md
similarity index 100%
rename from src/site/markdown/embedded/create_a_piranha_embedded_graalvm_application.md
rename to embedded/src/site/markdown/create_a_piranha_embedded_graalvm_application.md
diff --git a/src/site/markdown/embedded/create_an_embedded_jlink_application.md b/embedded/src/site/markdown/create_an_embedded_jlink_application.md
similarity index 100%
rename from src/site/markdown/embedded/create_an_embedded_jlink_application.md
rename to embedded/src/site/markdown/create_an_embedded_jlink_application.md
diff --git a/src/site/markdown/embedded/index.md b/embedded/src/site/markdown/index.md
similarity index 100%
rename from src/site/markdown/embedded/index.md
rename to embedded/src/site/markdown/index.md
diff --git a/src/site/markdown/embedded/running_piranha_embedded_with_spring_boot.md b/embedded/src/site/markdown/running_piranha_embedded_with_spring_boot.md
similarity index 100%
rename from src/site/markdown/embedded/running_piranha_embedded_with_spring_boot.md
rename to embedded/src/site/markdown/running_piranha_embedded_with_spring_boot.md
diff --git a/embedded/src/site/site.xml b/embedded/src/site/site.xml
new file mode 100644
index 0000000000..b1f93b4f95
--- /dev/null
+++ b/embedded/src/site/site.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project 
+    xmlns="http://maven.apache.org/DECORATION/1.8.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+    <body>
+        <menu name="Embedded">
+            <item name="Introduction" href="index.html"/>
+            <item name="Maven Coordinates" href="dependency-info.html"/>
+            <item name="Create a Piranha Embedded GraalVM application" href="create_a_piranha_embedded_graalvm_application.html"/>
+            <item name="Create a Hello World web application" href="create_a_hello_world_web_application.html"/>
+            <item name="Create an embedded JLink application" href="create_an_embedded_jlink_application.html"/>
+            <item name="Running Piranha Embedded with Spring Boot" href="running_piranha_embedded_with_spring_boot.html"/>
+        </menu>
+    </body>
+    <custom>
+        <fluidoSkin>
+            <copyrightClass>pull-right</copyrightClass>
+            <gitHub>
+                <projectId>piranhacloud/piranha</projectId>
+                <ribbonOrientation>left-bottom</ribbonOrientation>
+                <ribbonColor>black</ribbonColor>
+            </gitHub>
+            <twitter>
+                <user>piranha_cloud</user>
+            </twitter>
+        </fluidoSkin>
+    </custom>
+    <poweredBy>
+        <logo/>
+    </poweredBy>
+    <publishDate position="right"/>
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-fluido-skin</artifactId>
+        <version>2.0.0</version>
+    </skin>
+    <version position="left"/>
+</project>
\ No newline at end of file
diff --git a/extension/angus/pom.xml b/extension/angus/pom.xml
index da3c85835c..fe61aa64fd 100644
--- a/extension/angus/pom.xml
+++ b/extension/angus/pom.xml
@@ -37,4 +37,10 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/angus/</url>
+        </site>
+    </distributionManagement>
 </project>
diff --git a/extension/annotationscan-classfile/pom.xml b/extension/annotationscan-classfile/pom.xml
index f0d9b4c99b..fa97feddbd 100644
--- a/extension/annotationscan-classfile/pom.xml
+++ b/extension/annotationscan-classfile/pom.xml
@@ -36,6 +36,13 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/annotationscanclassfile/</url>
+        </site>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>
diff --git a/extension/annotationscan/pom.xml b/extension/annotationscan/pom.xml
index c6c96c9a8d..cd77b70a21 100644
--- a/extension/annotationscan/pom.xml
+++ b/extension/annotationscan/pom.xml
@@ -41,6 +41,13 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/annotationscan/</url>
+        </site>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>
diff --git a/extension/bytesstreamhandler/pom.xml b/extension/bytesstreamhandler/pom.xml
index 09a9434fa3..b3183c88cd 100644
--- a/extension/bytesstreamhandler/pom.xml
+++ b/extension/bytesstreamhandler/pom.xml
@@ -42,4 +42,12 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/bytestreamhandler/</url>
+        </site>
+    </distributionManagement>
+    
 </project>
diff --git a/extension/compat-glassfish7x/pom.xml b/extension/compat-glassfish7x/pom.xml
index da679b5f3d..2d0bd70d9a 100644
--- a/extension/compat-glassfish7x/pom.xml
+++ b/extension/compat-glassfish7x/pom.xml
@@ -45,4 +45,12 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/glassfish7x/</url>
+        </site>
+    </distributionManagement>
+
 </project>
diff --git a/extension/compat-tomcat10x/pom.xml b/extension/compat-tomcat10x/pom.xml
index 7de8463d10..57ee8dc198 100644
--- a/extension/compat-tomcat10x/pom.xml
+++ b/extension/compat-tomcat10x/pom.xml
@@ -45,4 +45,11 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/tomcat10x/</url>
+        </site>
+    </distributionManagement>
 </project>
diff --git a/extension/concurro/pom.xml b/extension/concurro/pom.xml
index 9592a9a1f7..6a3e46f58c 100644
--- a/extension/concurro/pom.xml
+++ b/extension/concurro/pom.xml
@@ -37,4 +37,12 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
+    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/concurro/</url>
+        </site>
+    </distributionManagement>
+    
 </project>
diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml
index e349bb7ace..fd3a8f733d 100644
--- a/extension/coreprofile/pom.xml
+++ b/extension/coreprofile/pom.xml
@@ -74,4 +74,10 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/coreprofile/</url>
+        </site>
+    </distributionManagement>
 </project>
diff --git a/extension/pom.xml b/extension/pom.xml
index 90c6538dd7..c513828f18 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Extension - Project</name>
+    <name>Piranha - Extension</name>
 
     <modules>
         <module>annotationscan</module>
@@ -94,4 +94,12 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/extension/</url>
+        </site>
+    </distributionManagement>
+    
 </project>
diff --git a/maven/archetypes/pom.xml b/maven/archetypes/pom.xml
index c00e12286a..03e00ec8e4 100644
--- a/maven/archetypes/pom.xml
+++ b/maven/archetypes/pom.xml
@@ -13,5 +13,12 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Maven - Archetypes - Project</name>
+    <name>Piranha - Maven - Archetypes</name>
+
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/maven/archetypes/</url>
+        </site>
+    </distributionManagement>    
 </project>
diff --git a/maven/plugin/pom.xml b/maven/plugin/pom.xml
index 17f49d1e58..d2849d17ac 100644
--- a/maven/plugin/pom.xml
+++ b/maven/plugin/pom.xml
@@ -75,6 +75,12 @@
             </plugin>
         </plugins>
     </build>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/maven/plugin/</url>
+        </site>
+    </distributionManagement>    
     <reporting>
         <plugins>
             <plugin>
diff --git a/maven/pom.xml b/maven/pom.xml
index 601508a8d2..17c44b3ee3 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - Maven - Project</name>
+    <name>Piranha - Maven</name>
 
     <modules>
         <module>archetypes</module>
@@ -31,4 +31,10 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/maven/</url>
+        </site>
+    </distributionManagement>    
 </project>
diff --git a/pom.xml b/pom.xml
index fe5457704a..cdaffb55fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <version>24.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Piranha - Project</name>
+    <name>Piranha</name>
     <description>
         The Piranha Project delivers you with a variety of cloud containers
         and several useful add-on modules
@@ -63,7 +63,11 @@
         <developerConnection>scm:git:git@github.com:piranhacloud/piranha.git</developerConnection>
         <url>https://github.com/piranhacloud/piranha</url>
     </scm>
-    <distributionManagement>    
+    <distributionManagement>
+        <site>
+            <id>default</id>
+            <url>file:///tmp/piranha/</url>
+        </site>
         <snapshotRepository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -1051,17 +1055,7 @@
     </build>
 
     <profiles>
-        <!--
-        
-        This profile is used for generating our docs.
-        
-        -->
-        <profile>
-            <id>docs</id>
-            <modules>
-                <module>docs</module>
-            </modules>
-        </profile>
+
         <!-- 
 
         This profile is for Eclipse m2e users.
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index efaa320116..85b15bc19b 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -36,7 +36,7 @@ distribution supports see our [Jakarta EE / Micro Profile matrix](https://piranh
 
 ## Maven Plugin documentation
 
-If you are using Maven and want to use our convenient Maven plugin for a quick iterative development cycle, see the [Piranha Maven plugin documentation](../maven/piranha-maven-plugin/index.html).
+If you are using Maven and want to use our convenient Maven plugin for a quick iterative development cycle, see the [Piranha Maven plugin documentation](maven/plugin/index.html).
 
 ## Extending Piranha
 
@@ -44,6 +44,9 @@ You can extend the capability of a Piranha distribution by means of extensions.
 
 ## How do you run Piranha in a container
 
-Piranha images are available from the [GitHub container registry](https://github.com/orgs/piranhacloud/packages), on a best effort basis. If you desire commercially supported images we suggest you contact our commercial partner [OmniFish](https://omnifish.ee/contact-us/).
+Piranha images are available from the [GitHub container registry](https://github.com/orgs/piranhacloud/packages), on a best effort basis.
 
-[Up](../)
+## Commercial support
+
+If you desire commercial support we suggest you contact our commercial partner 
+[OmniFish](https://omnifish.ee/contact-us/).
diff --git a/src/site/site.xml b/src/site/site.xml
index 2b0734e44e..cb89f4ddf1 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -14,35 +14,22 @@
     </bannerRight>
     <body>
         <links>
-            <item name="Core Profile" href="coreprofile/index.html" />
-            <item name="Embedded" href="embedded/index.html" />
-            <item name="Micro" href="micro/index.html" />
-            <item name="Server" href="server/index.html" />
-            <item name="Servlet" href="servlet/index.html" />
-            <item name="Web Profile" href="webprofile/index.html" />
+            <item name="Core Profile" href="/dist/coreprofile/index.html" />
+            <item name="Embedded" href="/embedded/index.html" />
+            <item name="Micro" href="/micro/index.html" />
+            <item name="Server" href="/server/index.html" />
+            <item name="Servlet" href="/servlet/index.html" />
+            <item name="Web Profile" href="/webprofile/index.html" />
         </links>
-        <menu name="Overview">
+        <menu inherit="top" name="Overview">
             <item name="Getting Started" href="index.html"/>
         </menu>
-        <menu name="Piranha Core Profile">
-            <item name="Overview" href="coreprofile/index.html" />
-            <item name="Guides">
-                <item name="Create a REST service" href="coreprofile/create_a_rest_service.html"/>
-                <item name="Create a JSON REST service" href="coreprofile/create_a_json_rest_service.html"/>
-                <item name="Debugging a REST service with NetBeans" href="coreprofile/debugging_a_rest_service_with_netbeans.html"/>
-                <item name="Debugging a REST service with VSCode" href="coreprofile/debugging_a_rest_service_with_vscode.html"/>
-                <item name="Testing with JUnit 5 and Arquillian" href="coreprofile/testing_with_junit5_and_arquillian.html"/>
-                <item name="Using Project CRaC" href="coreprofile/using_project_crac.html"/>
-            </item>
+        <menu name="Distributions">
+            <item name="Core Profile" href="dist/coreprofile/index.html" />
+            <item name="Embedded" href="embedded/index.html" />
         </menu>
-        <menu name="Piranha Embedded">
-            <item name="Overview" href="embedded/index.html"/>
-            <item name="Guides">
-                <item name="Create a Piranha Embedded GraalVM application" href="embedded/create_a_piranha_embedded_graalvm_application.html"/>
-                <item name="Create a Hello World web application" href="embedded/create_a_hello_world_web_application.html"/>
-                <item name="Create an embedded JLink application" href="embedded/create_an_embedded_jlink_application.html"/>
-                <item name="Running Piranha Embedded with Spring Boot" href="embedded/running_piranha_embedded_with_spring_boot.html"/>
-            </item>
+        <menu inherit="bottom" name="Maven">
+            <item name="Plugin" href="maven/plugin/index.html"/>
         </menu>
         <menu name="Piranha Micro">
             <item name="Overview" href="micro/index.html"/>
@@ -77,6 +64,7 @@
                 <item name="Testing with our container image" href="webprofile/testing_with_our_container_image.html"/>
             </item>
         </menu>
+        <menu ref="modules"/>
     </body>
     <custom>
         <fluidoSkin>