diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index ba2c192..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>${file.separator}</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-				<include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
-			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c6c9006..65bc509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
 		<artifactId>maven-parent</artifactId>
 		<version>1.0.0</version>
 	</parent>
+
 	<groupId>org.gcube.accounting</groupId>
 	<artifactId>accounting-insert-storage-se-plugin</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
@@ -23,6 +24,7 @@
 		<developerConnection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</developerConnection>
 		<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</url>
 	</scm>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -62,20 +64,11 @@
 			<artifactId>common-scope</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Home Library -->
-		<!-- <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library-jcr</artifactId> 
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> </dependency> <dependency> 
-			<groupId>org.gcube.common</groupId> <artifactId>home-library</artifactId> 
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <scope>compile</scope> 
-			</dependency> -->
-		<!-- END Home Library -->
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<!-- CouchBase libraries -->
 		<dependency>
 			<groupId>com.couchbase.client</groupId>
@@ -89,7 +82,7 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- END CouchBase libraries -->
-		<!-- Document Store and accounting lib -->
+		<!-- Document Store and Accounting lib -->
 		<dependency>
 			<groupId>org.gcube.data.publishing</groupId>
 			<artifactId>document-store-lib-couchbase</artifactId>
@@ -100,19 +93,17 @@
 			<groupId>org.gcube.data.publishing</groupId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<!-- END Document Store and Accounting lib -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>2.7</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
@@ -123,7 +114,7 @@
 			<artifactId>storage-manager-core</artifactId>
 			<version>[2.2.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 		</dependency>
-
+		<!-- Test Dependency -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -137,32 +128,20 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
 				<executions>
 					<execution>
-						<id>servicearchive</id>
+						<id>make-uberjar</id>
 						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
 					</execution>
 					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
+						<id>make-servicearchive</id>
+						<phase>install</phase>
 					</execution>
 				</executions>
 			</plugin>