diff --git a/pom.xml b/pom.xml
index 68ed3f7..a10e9f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>validationtool-${project.version}-standalone</finalName>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>standalone</shadedClassifierName>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>de.kosit.validationtool.cmd.CommandLineApplication</mainClass>
@@ -202,7 +203,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <finalName>validationtool-${project.version}-java8-standalone</finalName>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>java8-standalone</shadedClassifierName>
                             <artifactSet>
                                 <excludes>
                                     <exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
@@ -232,22 +234,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>standalone_dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/assembly/assembly-standalone.xml</descriptor>
-                            </descriptors>
-                            <attach>true</attach>
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <outputDirectory>target/</outputDirectory>
-                            <workDirectory>target/assembly/standalone</workDirectory>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>full_dist</id>
                         <phase>package</phase>
@@ -256,7 +242,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/assembly/assembly-full.xml</descriptor>
+                                <descriptor>src/assembly/assembly-dist.xml</descriptor>
                             </descriptors>
                             <attach>true</attach>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/src/assembly/assembly-full.xml b/src/assembly/assembly-dist.xml
similarity index 100%
rename from src/assembly/assembly-full.xml
rename to src/assembly/assembly-dist.xml
diff --git a/src/assembly/assembly-standalone.xml b/src/assembly/assembly-standalone.xml
deleted file mode 100644
index 55eeb08..0000000
--- a/src/assembly/assembly-standalone.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-  ~ Licensed to the Koordinierungsstelle für IT-Standards (KoSIT) under
-  ~ one or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  KoSIT licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<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>standalone</id>
-    <formats>
-        <format>dir</format>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>validationtool-*standalone.jar</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/src/main/assembly/assembly-full.xml b/src/main/assembly/assembly-full.xml
deleted file mode 100644
index 5a50ed3..0000000
--- a/src/main/assembly/assembly-full.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ Licensed to the Koordinierungsstelle für IT-Standards (KoSIT) under
-  ~ one or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  KoSIT licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<assembly>
-    <id>full</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${project.build.directory}/classes</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/src/main/assembly/assembly-standalone.xml b/src/main/assembly/assembly-standalone.xml
deleted file mode 100644
index 199357f..0000000
--- a/src/main/assembly/assembly-standalone.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  ~ Licensed to the Koordinierungsstelle für IT-Standards (KoSIT) under
-  ~ one or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  KoSIT licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<assembly>
-    <id>standalone</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <unpack>true</unpack>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <directory>${project.build.directory}/classes</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>