diff --git a/.classpath b/.classpath
index b8c44f6..ac5bdde 100644
--- a/.classpath
+++ b/.classpath
@@ -23,5 +23,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index 90e7829..28c03af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,10 @@
 	</parent>
 
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-jaxrs-client.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-jaxrs-client.git</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-jaxrs-client.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/common-jaxrs-client.git</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/common-jaxrs-client</url>
 	</scm>
 
@@ -24,7 +26,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>3.0.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -50,8 +52,26 @@
 			<artifactId>jersey-client</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
+			<groupId>jakarta.ws.rs</groupId>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.ws</groupId>
+			<artifactId>jakarta.xml.ws-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.sun.xml.ws</groupId>
+			<artifactId>jaxws-rt</artifactId>
+
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/org/gcube/common/calls/jaxrs/JaxRSEndpointReference.java b/src/main/java/org/gcube/common/calls/jaxrs/JaxRSEndpointReference.java
index 95864ea..4d6b616 100644
--- a/src/main/java/org/gcube/common/calls/jaxrs/JaxRSEndpointReference.java
+++ b/src/main/java/org/gcube/common/calls/jaxrs/JaxRSEndpointReference.java
@@ -4,7 +4,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.EndpointReference;
+import jakarta.xml.ws.EndpointReference;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
diff --git a/src/main/java/org/gcube/common/calls/jaxrs/JaxRSRequestFilter.java b/src/main/java/org/gcube/common/calls/jaxrs/JaxRSRequestFilter.java
index 4007fc7..fa47571 100644
--- a/src/main/java/org/gcube/common/calls/jaxrs/JaxRSRequestFilter.java
+++ b/src/main/java/org/gcube/common/calls/jaxrs/JaxRSRequestFilter.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Map.Entry;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
 
 import org.gcube.common.calls.Interceptors;
 import org.gcube.common.calls.Request;
@@ -22,7 +22,7 @@ public class JaxRSRequestFilter implements ClientRequestFilter {
 
 	@Override
 	public void filter(final ClientRequestContext rc) throws IOException {
-		if (SecretManagerProvider.instance.get()!=null){
+		if (SecretManagerProvider.get()!=null){
 			Request requestContext = Interceptors.executeRequestChain(service.call());
 			for (Entry<String, String> entry: requestContext.getHeaders()){
 				rc.getHeaders().put(entry.getKey(), Collections.singletonList((Object)entry.getValue()));	
diff --git a/src/main/java/org/gcube/common/calls/jaxrs/TargetFactory.java b/src/main/java/org/gcube/common/calls/jaxrs/TargetFactory.java
index d969813..5fea549 100644
--- a/src/main/java/org/gcube/common/calls/jaxrs/TargetFactory.java
+++ b/src/main/java/org/gcube/common/calls/jaxrs/TargetFactory.java
@@ -1,9 +1,9 @@
 package org.gcube.common.calls.jaxrs;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.xml.ws.EndpointReference;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.xml.ws.EndpointReference;
 
 import org.gcube.common.gxrest.request.GXWebTargetAdapterRequest;
 import org.glassfish.jersey.client.ClientProperties;
diff --git a/src/main/java/org/gcube/common/calls/jaxrs/TargetFactoryDSL.java b/src/main/java/org/gcube/common/calls/jaxrs/TargetFactoryDSL.java
index 3d3f894..6060ea1 100644
--- a/src/main/java/org/gcube/common/calls/jaxrs/TargetFactoryDSL.java
+++ b/src/main/java/org/gcube/common/calls/jaxrs/TargetFactoryDSL.java
@@ -1,6 +1,6 @@
 package org.gcube.common.calls.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.WebTarget;
 
 import org.gcube.common.gxrest.request.GXWebTargetAdapterRequest;