diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28c47f0..d9d0622 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v4.0.0] - [2024-02-02]
+## [v4.0.0-SNAPSHOT] - [2024-02-02]
 
 - moved to jakarta and servelt6
 
diff --git a/pom.xml b/pom.xml
index 7f0407b..e06bab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-smartgears-app</artifactId>
-	<version>4.0.0</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Smartgears Application</name>
 
 
diff --git a/src/main/java/org/gcube/smartgears/ContextListener.java b/src/main/java/org/gcube/smartgears/ContextListener.java
index 1a0f65d..4a48753 100644
--- a/src/main/java/org/gcube/smartgears/ContextListener.java
+++ b/src/main/java/org/gcube/smartgears/ContextListener.java
@@ -4,10 +4,6 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jakarta.servlet.ServletContextEvent;
-import jakarta.servlet.ServletContextListener;
-import jakarta.servlet.annotation.WebListener;
-
 import org.gcube.smartgears.annotations.ManagedBy;
 import org.gcube.smartgears.application.manager.AppManagerObserver;
 import org.gcube.smartgears.context.application.ApplicationContext;
@@ -18,6 +14,9 @@ import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfo;
 import io.github.classgraph.ClassInfoList;
 import io.github.classgraph.ScanResult;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 
 @WebListener
 public class ContextListener implements ServletContextListener {
diff --git a/src/main/java/org/gcube/smartgears/ContextProvider.java b/src/main/java/org/gcube/smartgears/ContextProvider.java
index 9b8aa85..f11ad22 100644
--- a/src/main/java/org/gcube/smartgears/ContextProvider.java
+++ b/src/main/java/org/gcube/smartgears/ContextProvider.java
@@ -4,6 +4,7 @@ import java.nio.file.Path;
 import java.util.List;
 
 import org.gcube.common.events.Hub;
+import org.gcube.common.security.factories.AuthorizationProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
 import org.gcube.smartgears.context.Properties;
@@ -11,7 +12,6 @@ import org.gcube.smartgears.context.application.ApplicationContext;
 import org.gcube.smartgears.context.container.ContainerContext;
 import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle;
 import org.gcube.smartgears.persistence.PersistenceWriter;
-import org.gcube.smartgears.security.AuthorizationProvider;
 import org.gcube.smartgears.security.secrets.SecretFactory;
 
 import jakarta.servlet.ServletContext;
diff --git a/src/main/java/org/gcube/smartgears/application/manager/AppManagerObserver.java b/src/main/java/org/gcube/smartgears/application/manager/AppManagerObserver.java
index 693d0cd..c70ca59 100644
--- a/src/main/java/org/gcube/smartgears/application/manager/AppManagerObserver.java
+++ b/src/main/java/org/gcube/smartgears/application/manager/AppManagerObserver.java
@@ -2,9 +2,9 @@ package org.gcube.smartgears.application.manager;
 
 import java.util.Set;
 
+import org.gcube.common.security.factories.AuthorizationProvider;
 import org.gcube.smartgears.ApplicationManager;
 import org.gcube.smartgears.context.application.ApplicationContext;
-import org.gcube.smartgears.security.AuthorizationProvider;
 
 public interface AppManagerObserver {
 
diff --git a/src/main/java/org/gcube/smartgears/application/manager/OfflineObserver.java b/src/main/java/org/gcube/smartgears/application/manager/OfflineObserver.java
index e2ec55f..069f653 100644
--- a/src/main/java/org/gcube/smartgears/application/manager/OfflineObserver.java
+++ b/src/main/java/org/gcube/smartgears/application/manager/OfflineObserver.java
@@ -9,10 +9,10 @@ import java.util.concurrent.Future;
 
 import org.gcube.common.events.Observes;
 import org.gcube.common.events.Observes.Kind;
+import org.gcube.common.security.factories.AuthorizationProvider;
 import org.gcube.smartgears.ApplicationManager;
 import org.gcube.smartgears.Constants;
 import org.gcube.smartgears.context.application.ApplicationContext;
-import org.gcube.smartgears.security.AuthorizationProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
index 9c66326..e32e8a0 100644
--- a/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
+++ b/src/main/java/org/gcube/smartgears/application/manager/OnlineObserver.java
@@ -12,13 +12,13 @@ import java.util.concurrent.Future;
 
 import org.gcube.common.events.Observes;
 import org.gcube.common.events.Observes.Kind;
+import org.gcube.common.security.factories.AuthorizationProvider;
 import org.gcube.common.security.providers.SecretManagerProvider;
 import org.gcube.common.security.secrets.Secret;
 import org.gcube.smartgears.ApplicationManager;
 import org.gcube.smartgears.Constants;
 import org.gcube.smartgears.ManagerPair;
 import org.gcube.smartgears.context.application.ApplicationContext;
-import org.gcube.smartgears.security.AuthorizationProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;