diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index f6f2b944..7083ceb0 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -176,7 +176,6 @@ jobs:
         fi
         echo "Using VERSION=$VERSION"
         echo "::set-env name=VERSION::$VERSION"
-        mv ./mvnd-dist.zip/mvnd-dist-*.zip ./mvnd-dist.zip/mvnd-dist.zip
 
     - name: Create Release
       id: create_release
diff --git a/daemon/pom.xml b/daemon/pom.xml
index 2767da95..bac5e0cb 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -30,10 +30,6 @@
     <packaging>jar</packaging>
     <name>Maven Daemon</name>
 
-    <properties>
-        <os.arch>${os.arch}</os.arch><!-- provisio plugin does not see system properties -->
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jboss.fuse.mvnd</groupId>
diff --git a/daemon/src/main/provisio/maven-distro.xml b/daemon/src/main/provisio/maven-distro.xml
index 991d36d4..fb383ded 100644
--- a/daemon/src/main/provisio/maven-distro.xml
+++ b/daemon/src/main/provisio/maven-distro.xml
@@ -17,28 +17,28 @@
 -->
 <assembly>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin">
             <unpack useRoot="false"
                     excludes="lib/slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*"/>
         </artifact>
     </artifactSet>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/lib">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/lib">
         <artifact id="org.apache.maven:maven-embedder"/>
         <artifactSet to="ext" ref="runtime.classpath"/>
     </artifactSet>
 
-    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
+    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
         <directory path="${basedir}/src/main/distro"/>
     </fileSet>
-    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/bin">
+    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/bin">
         <directory path="${basedir}/../client/target">
             <include>mvnd</include>
             <include>mvnd.exe</include>
         </directory>
     </fileSet>
 
-    <archive name="mvnd-${project.version}-${os.detected.name}-${os.arch}.zip" executable="**/bin/mvnd"/>
+    <archive name="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}.zip" executable="**/bin/mvnd"/>
 
 </assembly>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2218ef4d..212a0b52 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
-        <mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.arch}</mvnd.home>
+        <mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
     </properties>
 
     <dependencies>