diff --git a/pom.xml b/pom.xml
index 5c6d19a..6ef9bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
 	<description>accounting-manager manages accounting informations</description>
 
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/accounting-manager.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/accounting-manager.git</developerConnection>
-		<url>https://code-repo.d4science.org/gCubeSystem/accounting-manager</url>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 
 
@@ -180,8 +180,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<!-- <version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version> -->
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -248,7 +247,7 @@
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-analytics</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<version>[2.0.0,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<!-- Document Store Lib -->
@@ -263,7 +262,7 @@
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-analytics-persistence-couchbase</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<!-- Apache Commons CSV -->
@@ -376,7 +375,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
 				<executions>
 					<execution>
 						<phase>compile</phase>
@@ -397,7 +395,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
 				<configuration>
 					<source>${maven.compiler.source}</source>
 					<target>${maven.compiler.target}</target>
@@ -408,7 +405,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
 				<configuration>
 					<skipTests>false</skipTests>
 				</configuration>
@@ -416,7 +412,7 @@
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit47</artifactId>
-						<version>2.16</version>
+						<version>3.0.0-M3</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -449,7 +445,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>LATEST</version>
+				<version>3.6.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>