diff --git a/build/pom.xml b/build/pom.xml
index c4afe020bb4..ca0ef7b4a80 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -30,7 +30,7 @@
     </dependencies>
 
     <build>
-        <finalName>${server.output.dir.prefix}-${project.version}</finalName>
+        <finalName>${server.output.dir.prefix}-${wildfly.core.release.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
diff --git a/dist/pom.xml b/dist/pom.xml
index e8151b850e2..9ca962ddc87 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -33,6 +33,7 @@
         </dependency>
     </dependencies>
     <build>
+        <finalName>${server.output.dir.prefix}-${wildfly.core.release.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
@@ -44,7 +45,7 @@
                             <goal>provision</goal>
                         </goals>
                         <configuration>
-                            <install-dir>${basedir}/target/${project.build.finalName}</install-dir>
+                            <install-dir>${project.build.directory}/${project.build.finalName}</install-dir>
                             <record-state>false</record-state>
                             <log-time>${galleon.log.time}</log-time>
                             <offline>true</offline>
@@ -73,7 +74,6 @@
                 </property>
             </activation>
             <build>
-                <finalName>${server.output.dir.prefix}-${wildfly.core.release.version}</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 2fd219e5280..5582e366fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,8 @@
         <version.org.wildfly.licenses.plugin>2.4.1.Final</version.org.wildfly.licenses.plugin>
         <version.versions.plugin>2.5</version.versions.plugin>
         <version.xml.plugin>1.1.0</version.xml.plugin>
-        <wildfly.build.output.dir>dist/target/${server.output.dir.prefix}-${wildfly.core.release.version}</wildfly.build.output.dir>
+        <wildfly.build.output.dir>build/target/${server.output.dir.prefix}-${wildfly.core.release.version}</wildfly.build.output.dir>
+        <wildfly.dist.output.dir>dist/target/${server.output.dir.prefix}-${wildfly.core.release.version}</wildfly.dist.output.dir>
         <!-- Release Info -->
         <wildfly.core.release.version>${project.version}</wildfly.core.release.version>
         <wildfly.core.scm.connection>git@github.com:wildfly/wildfly-core.git</wildfly.core.scm.connection>
diff --git a/testsuite/manualmode/pom.xml b/testsuite/manualmode/pom.xml
index 8d94751002b..870fe549444 100644
--- a/testsuite/manualmode/pom.xml
+++ b/testsuite/manualmode/pom.xml
@@ -294,7 +294,7 @@
                                 <javax.net.ssl.keyStore>${basedir}/target/test-classes/ssl/jbossClient.keystore</javax.net.ssl.keyStore>
                                 <javax.net.ssl.trustStorePassword>clientPassword</javax.net.ssl.trustStorePassword>
                                 <javax.net.ssl.keyStorePassword>clientPassword</javax.net.ssl.keyStorePassword>
-                                <standard.dist.version>${project.version}</standard.dist.version>
+                                <dist.output.dir>${wildfly.dist.output.dir}</dist.output.dir>
                             </systemPropertyVariables>
                             <environmentVariables>
                                 <JBOSS_HOME>${wildfly.home}</JBOSS_HOME>
diff --git a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/provisioning/ProvisioningConsistencyTestCase.java b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/provisioning/ProvisioningConsistencyTestCase.java
index 3b0f90bcb4b..361f1be2c82 100644
--- a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/provisioning/ProvisioningConsistencyTestCase.java
+++ b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/provisioning/ProvisioningConsistencyTestCase.java
@@ -47,7 +47,7 @@ public class ProvisioningConsistencyTestCase {
     private static final Path INSTALLATION_METADATA = CHANNEL_INSTALLATION.resolve(INSTALLATION);
     private static final Path PROVISIONING_XML = CHANNEL_INSTALLATION.resolve(PROVISIONING);
     private static final Path SOURCE_HOME = JBOSS_HOME.getParent().getParent().getParent().getParent();
-    private static final Path DIST_INSTALLATION = SOURCE_HOME.resolve("dist").resolve("target").resolve(getDistDir());
+    private static final Path DIST_INSTALLATION = SOURCE_HOME.resolve(System.getProperty("dist.output.dir"));
 
     private static Path resolveJBossHome() {
         try {
@@ -57,10 +57,6 @@ private static Path resolveJBossHome() {
         }
     }
 
-    private static String getDistDir() {
-        return "wildfly-core-dist-" + System.getProperty("standard.dist.version");
-    }
-
     private static File getDistFile(Path channelPath, boolean exists, boolean directory, List<String> errors) {
         Path relative = CHANNEL_INSTALLATION.relativize(channelPath);
         System.out.println("Getting dist file for relative path " + relative);