diff --git a/pom.xml b/pom.xml
index 110c729..c9ccdee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
 		<artifactId>maven-parent</artifactId>
@@ -16,11 +17,11 @@
 	<description>Accounting Dashboard Harvester SmartExecutor Plugin</description>
 
 	<scm>
-		<connection>scm::git:https://code-repo.d4science.org/gCubeSystem/accounting-dashboard-harvester-se-plugin.git</connection>
-		<developerConnection>scm::git:https://code-repo.d4science.org/gCubeSystem/accounting-dashboard-harvester-se-plugin.git</developerConnection>
-		<url>https://code-repo.d4science.org/gCubeSystem/accounting-dashboard-harvester-se-plugin.git</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>
-	
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<distroDirectory>distro</distroDirectory>
@@ -72,8 +73,8 @@
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
-  			<artifactId>commons-lang</artifactId>
-  			<version>2.6</version>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
@@ -95,7 +96,7 @@
 			<artifactId>google-http-client-gson</artifactId>
 			<version>1.21.0</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-library</artifactId>
@@ -150,7 +151,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- END Dependencies forced to provided -->
-		
+
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>ic-client</artifactId>
@@ -161,7 +162,7 @@
 			<artifactId>registry-publisher</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-analytics</artifactId>
@@ -172,26 +173,26 @@
 			<artifactId>accounting-analytics-persistence-couchbase</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-summary-access</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
 			<version>20171018</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- Test Dependencies -->
 		<dependency>
 			<groupId>junit</groupId>