diff --git a/build/assembly.xml b/build/assembly.xml
index af0912b..5693771 100644
--- a/build/assembly.xml
+++ b/build/assembly.xml
@@ -9,13 +9,15 @@
     <id>distro</id>
     <formats>
        <format>zip</format>
-       <format>tar.gz</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
             <directory>target</directory>
             <outputDirectory/>
+            <includes>
+                <include>${server.name}/**</include>
+            </includes>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/build/pom.xml b/build/pom.xml
index ed5561c..e90f0e8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -20,6 +20,11 @@
 
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <server.name>${project.artifactId}-${project.version}</server.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>