diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a18b643b..de6a1ede 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -83,8 +83,10 @@ jobs:
         with:
           name: artifacts
           path: |
-            dist-*/target/maven-*-mvnd-*.zip
-            dist-*/target/maven-*-mvnd-*.tar.gz
+            dist-m39/target/maven-mvnd-*.zip
+            dist-m39/target/maven-mvnd-*.tar.gz
+            dist-m40/target/maven-mvnd-*.zip
+            dist-m40/target/maven-mvnd-*.tar.gz
 
   source:
     name: 'Build source distributions'
@@ -184,123 +186,123 @@ jobs:
           asset_name: maven-mvnd-${{ env.VERSION }}-src.tar.gz
           asset_content_type: application/tar.gz
 
-      - name: Deploy maven-mvnd-mvn39-linux-amd64.zip
+      - name: Deploy maven-mvnd-m39-linux-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.zip
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn39-linux-amd64.tar.gz
+      - name: Deploy maven-mvnd-m39-linux-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-linux-amd64.tar.gz
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-linux-amd64.tar.gz
           asset_content_type: application/x-gzip
 
-      - name: Deploy maven-mvnd-mvn39-darwin-amd64.zip
+      - name: Deploy maven-mvnd-m39-darwin-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.zip
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn39-darwin-amd64.tar.gz
+      - name: Deploy maven-mvnd-m39-darwin-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-darwin-amd64.tar.gz
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-darwin-amd64.tar.gz
           asset_content_type: application/x-gzip
 
-      - name: Deploy maven-mvnd-mvn39-windows-amd64.zip
+      - name: Deploy maven-mvnd-m39-windows-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.zip
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn39-windows-amd64.tar.gz
+      - name: Deploy maven-mvnd-m39-windows-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn39-windows-amd64.tar.gz
+          asset_path: artifacts/dist-m39/target/maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m39-windows-amd64.tar.gz
           asset_content_type: application/x-gzip
 
-      - name: Deploy maven-mvnd-mvn40-linux-amd64.zip
+      - name: Deploy maven-mvnd-m40-linux-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.zip
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn40-linux-amd64.tar.gz
+      - name: Deploy maven-mvnd-m40-linux-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-linux-amd64.tar.gz
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-linux-amd64.tar.gz
           asset_content_type: application/x-gzip
 
-      - name: Deploy maven-mvnd-mvn40-darwin-amd64.zip
+      - name: Deploy maven-mvnd-m40-darwin-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.zip
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn40-darwin-amd64.tar.gz
+      - name: Deploy maven-mvnd-m40-darwin-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-darwin-amd64.tar.gz
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-darwin-amd64.tar.gz
           asset_content_type: application/x-gzip
 
-      - name: Deploy maven-mvnd-mvn40-windows-amd64.zip
+      - name: Deploy maven-mvnd-m40-windows-amd64.zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.zip
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.zip
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.zip
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.zip
           asset_content_type: application/zip
 
-      - name: Deploy maven-mvnd-mvn40-windows-amd64.tar.gz
+      - name: Deploy maven-mvnd-m40-windows-amd64.tar.gz
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.tar.gz
-          asset_name: maven-${{ env.VERSION }}-mvnd-mvn40-windows-amd64.tar.gz
+          asset_path: artifacts/dist-m40/target/maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.tar.gz
+          asset_name: maven-mvnd-${{ env.VERSION }}-m40-windows-amd64.tar.gz
           asset_content_type: application/x-gzip
 
diff --git a/dist-m39/pom.xml b/dist-m39/pom.xml
index bdd41915..d596b3e0 100644
--- a/dist-m39/pom.xml
+++ b/dist-m39/pom.xml
@@ -71,7 +71,7 @@
             </goals>
             <phase>package</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}/maven-${project.version}-mvnd-m39-${os.detected.name}-${os.detected.arch}</outputDirectory>
+              <outputDirectory>${project.build.directory}/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}</outputDirectory>
             </configuration>
           </execution>
         </executions>
diff --git a/dist-m39/src/main/provisio/maven-distro.xml b/dist-m39/src/main/provisio/maven-distro.xml
index 5f4c1abd..f2b2759c 100644
--- a/dist-m39/src/main/provisio/maven-distro.xml
+++ b/dist-m39/src/main/provisio/maven-distro.xml
@@ -93,10 +93,10 @@
         </directory>
     </fileSet>
 
-    <archive name="maven-${project.version}-mvnd-mvn39-${os.detected.name}-${os.detected.arch}.zip"
+    <archive name="maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}.zip"
              executable="**/bin/mvnd"/>
 
-    <archive name="maven-${project.version}-mvnd-mvn39-${os.detected.name}-${os.detected.arch}.tar.gz"
+    <archive name="maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}.tar.gz"
              executable="**/bin/mvnd"/>
 
 </assembly>
diff --git a/dist-m40/pom.xml b/dist-m40/pom.xml
index 08a98724..c665b9ca 100644
--- a/dist-m40/pom.xml
+++ b/dist-m40/pom.xml
@@ -71,7 +71,7 @@
             </goals>
             <phase>package</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}/maven-${project.version}-mvnd-m40-${os.detected.name}-${os.detected.arch}</outputDirectory>
+              <outputDirectory>${project.build.directory}/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}</outputDirectory>
             </configuration>
           </execution>
         </executions>
diff --git a/dist-m40/src/main/provisio/maven-distro.xml b/dist-m40/src/main/provisio/maven-distro.xml
index ba287ddf..7cdea145 100644
--- a/dist-m40/src/main/provisio/maven-distro.xml
+++ b/dist-m40/src/main/provisio/maven-distro.xml
@@ -93,10 +93,10 @@
         </directory>
     </fileSet>
 
-    <archive name="maven-${project.version}-mvnd-mvn40-${os.detected.name}-${os.detected.arch}.zip"
+    <archive name="maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}.zip"
              executable="**/bin/mvnd"/>
 
-    <archive name="maven-${project.version}-mvnd-mvn40-${os.detected.name}-${os.detected.arch}.tar.gz"
+    <archive name="maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}.tar.gz"
              executable="**/bin/mvnd"/>
 
 </assembly>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index caed3e52..1fe38feb 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,8 +32,8 @@
   <properties>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
-    <mvnd.m39.home>${project.basedir}/../dist-m39/target/maven-${project.version}-mvnd-m39-${os.detected.name}-${os.detected.arch}</mvnd.m39.home>
-    <mvnd.m40.home>${project.basedir}/../dist-m40/target/maven-${project.version}-mvnd-m40-${os.detected.name}-${os.detected.arch}</mvnd.m40.home>
+    <mvnd.m39.home>${project.basedir}/../dist-m39/target/maven-mvnd-${project.version}-m39-${os.detected.name}-${os.detected.arch}</mvnd.m39.home>
+    <mvnd.m40.home>${project.basedir}/../dist-m40/target/maven-mvnd-${project.version}-m40-${os.detected.name}-${os.detected.arch}</mvnd.m40.home>
     <preinstall.artifacts>org/apache/maven/surefire/surefire-providers/${surefire.version}
             org/apache/maven/surefire/surefire-junit-platform/${surefire.version}
             org/junit/platform/junit-platform-launcher/${junit-platform-launcher.version}