diff --git a/pom.xml b/pom.xml
index 8e1f9a5..96dde44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
-		<distroDirectory>${project.basedir}/distro</distroDirectory>
+		<webappDirectory>${project.basedir}${file.separator}src${file.separator}main${file.separator}webapp${file.separator}WEB-INF</webappDirectory>
 		<serviceClass>InformationSystem</serviceClass>
 	</properties>
 
@@ -121,32 +120,46 @@
 							<outputDirectory>${webappDirectory}</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${distroDirectory}</directory>
+									<directory>${project.basedir}</directory>
 									<filtering>true</filtering>
+									<excludes>
+										<exclude>src</exclude>
+									</excludes>
+									<includes>
+										<include>LICENSE.md</include>
+										<include>README.md</include>
+										<include>web.xml</include>
+										<include>gcube-app.xml</include>
+										<include>changelog.xml</include>
+									</includes>
 								</resource>
 							</resources>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			
+			<!-- <finalName>${artifactId}</finalName> -->
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-					<warName>${artifactId}</warName>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<!-- webXml>src\main\webapp\WEB-INF\web.xml</webXml -->
+					<descriptors>
+						<descriptor>descriptor.xml</descriptor>
+					</descriptors>
 				</configuration>
 				<executions>
 					<execution>
 						<id>servicearchive</id>
 						<phase>install</phase>
 						<goals>
-							<goal>war</goal>
+							<goal>single</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 </project>