diff --git a/pom.xml b/pom.xml
index b7aa61b0..49d6353e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,16 +16,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>com.bmwcarit.barefoot.matcher.ServerControl</mainClass>
-						</manifest>
-					</archive>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
 				<executions>
 					<execution>
 						<id>barefoot-matcher</id>
@@ -34,7 +24,9 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>${project.build.finalName}-matcher</finalName>
+							<descriptors>
+								<descriptor>src/assembly/matcher.xml</descriptor>
+							</descriptors>
 							<archive>
 								<manifest>
 									<mainClass>com.bmwcarit.barefoot.matcher.ServerControl</mainClass>
@@ -49,7 +41,9 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>${project.build.finalName}-tracker</finalName>
+							<descriptors>
+								<descriptor>src/assembly/tracker.xml</descriptor>
+							</descriptors>
 							<archive>
 								<manifest>
 									<mainClass>com.bmwcarit.barefoot.tracker.TrackerControl</mainClass>
diff --git a/src/assembly/matcher.xml b/src/assembly/matcher.xml
new file mode 100644
index 00000000..c91eb704
--- /dev/null
+++ b/src/assembly/matcher.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>matcher-jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.version}-matcher.xml${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/src/assembly/tracker.xml b/src/assembly/tracker.xml
new file mode 100644
index 00000000..3e12c6e8
--- /dev/null
+++ b/src/assembly/tracker.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>tracker-jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.version}-tracker.xml${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
\ No newline at end of file