diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index c4d83c8f6b..173a708a24 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,4 +1,4 @@
    <!-- The web server is only bound to loalhost by default -->
    <web bind="${web.protocol}://${http.host}:${http.port}" path="web"${extra.web.attributes}>
-       <app url="jolokia" war="jolokia-war-1.3.5.war"/>
+       <app url="jolokia" war="jolokia.war"/>
    </web>
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 92c984cce6..8e3dd93984 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -139,6 +139,7 @@
          </includes>
          <outputDirectory>web</outputDirectory>
          <unpack>false</unpack>
+         <outputFileNameMapping>jolokia.war</outputFileNameMapping>
       </dependencySet>
    </dependencySets>
    <fileSets>