diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
index 1872a98fab..43492df134 100644
--- a/.github/workflows/docs-release.yml
+++ b/.github/workflows/docs-release.yml
@@ -61,12 +61,12 @@ jobs:
     - name: Build with Maven
       run: |
         mvn -B -DskipTests -DskipITs -ntp install
-        cd maven/plugins/piranha-maven-plugin
+        cd maven/plugin
         mvn -B -DskipTests -DskipITs -ntp site
-        cd ../../..
+        cd ../../
         rm -rf piranha-website/release/maven-plugin || true
         mkdir -p piranha-website/release/maven-plugin || true
-        cp -R maven/plugins/piranha-maven-plugin/target/site/* piranha-website/release/maven-plugin/
+        cp -R maven/plugin/target/site/* piranha-website/release/maven-plugin/
         cd piranha-website
         git config --global user.email "noreply@piranha.cloud"
         git config --global user.name "Automated publish"
diff --git a/.github/workflows/docs-snapshot.yml b/.github/workflows/docs-snapshot.yml
index 930be85072..3af7b81e85 100644
--- a/.github/workflows/docs-snapshot.yml
+++ b/.github/workflows/docs-snapshot.yml
@@ -63,12 +63,12 @@ jobs:
     - name: Build with Maven
       run: |
         mvn -B -DskipTests -DskipITs -ntp install
-        cd maven/plugins/piranha-maven-plugin
+        cd maven/plugin
         mvn -B -DskipTests -DskipITs -ntp site
-        cd ../../..
+        cd ../..
         rm -rf piranha-website/snapshot/maven-plugin || true
         mkdir -p piranha-website/snapshot/maven-plugin || true
-        cp -R maven/plugins/piranha-maven-plugin/target/site/* piranha-website/snapshot/maven-plugin/
+        cp -R maven/plugin/target/site/* piranha-website/snapshot/maven-plugin/
         cd piranha-website
         git config --global user.email "noreply@piranha.cloud"
         git config --global user.name "Automated publish"
diff --git a/maven/plugin/pom.xml b/maven/plugin/pom.xml
index f9db1da441..8e6beff0de 100644
--- a/maven/plugin/pom.xml
+++ b/maven/plugin/pom.xml
@@ -2,27 +2,22 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>cloud.piranha.maven</groupId>
         <artifactId>project</artifactId>
         <version>24.9.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-
     <name>Piranha - Maven - Plugin</name>
     <description>
         The Piranha Maven Plugin delivers you with a Maven plugin you can
         use to deploy your web application to any of our Piranha distributions
         facilitating an inner-loop development experience.
     </description>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
@@ -30,7 +25,6 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -75,7 +69,6 @@
             </plugin>
         </plugins>
     </build>
-
     <reporting>
         <plugins>
             <plugin>