diff --git a/avatar-importer/pom.xml b/avatar-importer/pom.xml
index ccbffc3..fbaabb5 100644
--- a/avatar-importer/pom.xml
+++ b/avatar-importer/pom.xml
@@ -27,12 +27,23 @@
 		<dependency>
 			<groupId>dnsjava</groupId>
 			<artifactId>dnsjava</artifactId>
-			<version>3.2.2</version>
+			<version>${dns-java.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons-codec.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>${json.simple.version}</version>
+			<version>${json-simple.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/delete-account/pom.xml b/delete-account/pom.xml
index 7fa7bcd..301c925 100644
--- a/delete-account/pom.xml
+++ b/delete-account/pom.xml
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>${json.simple.version}</version>
+			<version>${json-simple.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/event-listener-provider/pom.xml b/event-listener-provider/pom.xml
index 5fd0a99..86ec4c9 100644
--- a/event-listener-provider/pom.xml
+++ b/event-listener-provider/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>${json.simple.version}</version>
+			<version>${json-simple.version}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/keycloak-d4science-bundle/pom.xml b/keycloak-d4science-bundle/pom.xml
index 1bed9ea..71f94ab 100644
--- a/keycloak-d4science-bundle/pom.xml
+++ b/keycloak-d4science-bundle/pom.xml
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>${json.simple.version}</version>
+			<version>${json-simple.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
@@ -88,56 +88,56 @@
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>avatar-importer</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>avatar-importer.jar</bundleFileName>
+							<bundleFileName>avatar-importer-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>avatar-realm-resource</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>avatar-realm-resource.jar</bundleFileName>
+							<bundleFileName>avatar-realm-resource-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>delete-account</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>delete-account.jar</bundleFileName>
+							<bundleFileName>delete-account-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>event-listener-provider</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>event-listener-provider.jar</bundleFileName>
+							<bundleFileName>event-listener-provider-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>identity-provider-mapper</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>identity-provider-mapper.jar</bundleFileName>
+							<bundleFileName>identity-provider-mapper-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>keycloak-d4science-script</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>keycloak-d4science-script.jar</bundleFileName>
+							<bundleFileName>keycloak-d4science-script-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>keycloak-d4science-theme</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>keycloak-d4science-theme.jar</bundleFileName>
+							<bundleFileName>keycloak-d4science-theme-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 						<jarModule>
 							<groupId>org.gcube.iam</groupId>
 							<artifactId>ldap-storage-mapper</artifactId>
 							<includeInApplicationXml>true</includeInApplicationXml>
-							<bundleFileName>ldap-storage-mapper.jar</bundleFileName>
+							<bundleFileName>ldap-storage-mapper-${project.version}.jar</bundleFileName>
 							<bundleDir>/</bundleDir>
 						</jarModule>
 					</modules>
diff --git a/ldap-storage-mapper/src/main/java/org/gcube/keycloak/storage/ldap/mappers/UserAttributeTemplatedLDAPStorageMapper.java b/ldap-storage-mapper/src/main/java/org/gcube/keycloak/storage/ldap/mappers/UserAttributeTemplatedLDAPStorageMapper.java
index e4fadab..4948005 100644
--- a/ldap-storage-mapper/src/main/java/org/gcube/keycloak/storage/ldap/mappers/UserAttributeTemplatedLDAPStorageMapper.java
+++ b/ldap-storage-mapper/src/main/java/org/gcube/keycloak/storage/ldap/mappers/UserAttributeTemplatedLDAPStorageMapper.java
@@ -171,7 +171,7 @@ public class UserAttributeTemplatedLDAPStorageMapper extends AbstractLDAPStorage
             // lowercase before search
             email = KeycloakModelUtils.toLowerCaseSafe(email);
 
-            UserModel that = session.userLocalStorage().getUserByEmail(realm, email);
+            UserModel that = session.users().getUserByEmail(realm, email);
             if (that != null && !that.getId().equals(user.getId())) {
                 session.getTransactionManager().setRollbackOnly();
                 String exceptionMessage = String.format(