diff --git a/distro/LICENSE b/distro/LICENSE
index cdf50bd..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,4 +1 @@
-gCube System - License
-------------------------------------------------------------
-
 ${gcube.license}
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index c5e5f83..ba2c192 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -24,7 +24,7 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>target${file.separator}${build.finalName}.jar</source>
+			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
 			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
 		</file>
 	</files>
diff --git a/distro/profile.xml b/distro/profile.xml
index 89d379a..3a51bef 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -4,13 +4,13 @@
 	<ID />
 	<Type>Plugin</Type>
 	<Profile>
-		<Description>{description}</Description>
+		<Description>${description}</Description>
 		<Class>${serviceClass}</Class>
 		<Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
-				<Description>{description}</Description>
+				<Description>${description}</Description>
 				<Name>${artifactId}</Name>
 				<Version>${version}</Version>
 				<MavenCoordinates>
diff --git a/pom.xml b/pom.xml
index 5667c5f..f986251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 				<version>LATEST</version>
 				<type>pom</type>
 				<scope>import</scope>
-			</dependency>			
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -58,10 +58,10 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-encryption</artifactId>
-				<scope>provided</scope>
-			</dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-encryption</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 
 
@@ -96,15 +96,51 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+					<execution>
+						<id>copy-profile</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${distroDirectory}</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>profile.xml</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<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>
+						<phase>install</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
 					<execution>
 						<phase>package</phase>
 						<goals>