diff --git a/avatar-importer/pom.xml b/avatar-importer/pom.xml
index f9d1e4d..ccbffc3 100644
--- a/avatar-importer/pom.xml
+++ b/avatar-importer/pom.xml
@@ -19,7 +19,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-storage</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
diff --git a/avatar-realm-resource/pom.xml b/avatar-realm-resource/pom.xml
index 6b5b904..7db9538 100644
--- a/avatar-realm-resource/pom.xml
+++ b/avatar-realm-resource/pom.xml
@@ -21,7 +21,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-storage</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
diff --git a/delete-account/pom.xml b/delete-account/pom.xml
index 55c110a..7fa7bcd 100644
--- a/delete-account/pom.xml
+++ b/delete-account/pom.xml
@@ -26,16 +26,16 @@
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>event-listener-provider</artifactId>
 			<version>${project.version}</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-storage</artifactId>
 			<version>${project.version}</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
diff --git a/keycloak-d4science-bundle/pom.xml b/keycloak-d4science-bundle/pom.xml
index fffafec..7132525 100644
--- a/keycloak-d4science-bundle/pom.xml
+++ b/keycloak-d4science-bundle/pom.xml
@@ -21,38 +21,38 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-importer</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-realm-resource</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>avatar-storage</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>delete-account</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>event-listener-provider</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>identity-provider-mapper</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube</groupId>
+			<groupId>org.gcube.iam</groupId>
 			<artifactId>ldap-storage-mapper</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -75,42 +75,42 @@
 					<defaultLibBundleDir>lib</defaultLibBundleDir>
 					<modules>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>avatar-importer</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>avatar-importer.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>avatar-realm-resource</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>avatar-realm-resource.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>delete-account</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>delete-account.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>event-listener-provider</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>event-listener-provider.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>identity-provider-mapper</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>identity-provider-mapper.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
-							<groupId>org.gcube</groupId>
+							<groupId>org.gcube.iam</groupId>
 							<artifactId>ldap-storage-mapper</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
 							<bundleFileName>ldap-storage-mapper.jar</bundleFileName>
diff --git a/pom.xml b/pom.xml
index dbfa40c..1e2f7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,4 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -41,11 +39,13 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-    <scm>
-        <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>
+
+	<scm>
+		<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>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>