diff --git a/pom.xml b/pom.xml
index 83bafa471..b508bfa19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
 
     <build>
         <defaultGoal>clean install</defaultGoal>
-        <finalName>${project.outputName}-${project.version}</finalName>
+        <finalName>${project.outputName}-${project.version}-noshade</finalName>
 
         <resources>
             <resource>
@@ -197,6 +197,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <finalName>${project.outputName}-${project.version}</finalName>
                     <show>public</show>
                     <failOnError>false</failOnError>
                 </configuration>
@@ -213,6 +214,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <finalName>${project.outputName}-${project.version}</finalName>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -228,6 +232,8 @@
                 </executions>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                    <finalName>${project.outputName}-${project.version}</finalName>
 
                     <!--
                     Relocate all lib we use in order to fix class loading errors if we use different versions
@@ -287,54 +293,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
-                <executions>
-                    <execution>
-                        <id>default-install</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>install-custom</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <pomFile>pom.xml</pomFile>
-                    <file>target/original-${project.build.finalName}.jar</file>
-                    <javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
-                    <sources>target/${project.build.finalName}-sources.jar</sources>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>deploy-custom</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- TODO: find a solution to detect release/snapshot -->
-                    <repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId>
-                    <url>${project.distributionManagement.snapshotRepository.url}</url>
-                    <pomFile>pom.xml</pomFile>
-                    <file>target/original-${project.build.finalName}.jar</file>
-                    <!-- Already included by the plugin
-                    <javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
-                    <sources>target/${project.build.finalName}-sources.jar</sources>
-                    -->
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>