diff --git a/Client/pom.xml b/Client/pom.xml
index a6883f8fe0..ce0c52a99f 100644
--- a/Client/pom.xml
+++ b/Client/pom.xml
@@ -103,13 +103,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Multi-Release>true</Multi-Release>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -142,7 +135,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
+							<appendAssemblyId>true</appendAssemblyId>
 							<descriptorRefs>
 								<descriptorRef>jar-with-dependencies</descriptorRef>
 							</descriptorRefs>
@@ -154,7 +147,6 @@
 									<Multi-Release>true</Multi-Release>
 								</manifestEntries>
 							</archive>
-							<finalName>${project.artifactId}-jar-with-dependencies</finalName>
 						</configuration>
 					</execution>
 
@@ -165,7 +157,7 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
+							<appendAssemblyId>true</appendAssemblyId>
 							<descriptors>
 								<descriptor>src/main/assembly/jar-without-provider-dependencies.xml</descriptor>
 							</descriptors>
@@ -177,7 +169,6 @@
 									<Multi-Release>true</Multi-Release>
 								</manifestEntries>
 							</archive>
-							<finalName>${project.artifactId}-jar-without-provider-dependencies</finalName>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/pom.xml b/pom.xml
index 67916d141b..53d9a02577 100644
--- a/pom.xml
+++ b/pom.xml
@@ -554,7 +554,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>2.5.1</version>
+					<version>3.0.0-M1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>