diff --git a/pom.xml b/pom.xml
index 6ed75dd1..17ff29eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>2.31</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
@@ -394,6 +394,12 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.1.0</version>
+            <type>jar</type>
+        </dependency>
         
         <!-- 
         Test dependencies
diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/AdminUsersServiceImpl.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/AdminUsersServiceImpl.java
index fc05bc29..4876b8f8 100644
--- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/AdminUsersServiceImpl.java
+++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/AdminUsersServiceImpl.java
@@ -7,7 +7,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/PidProviderServiceImpl.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/PidProviderServiceImpl.java
index 70633e6a..a76f5f6e 100644
--- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/PidProviderServiceImpl.java
+++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/PidProviderServiceImpl.java
@@ -9,7 +9,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/DoiResponse.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/DoiResponse.java
index 22a66b87..18bbbe8a 100644
--- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/DoiResponse.java
+++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/pid/DoiResponse.java
@@ -2,12 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.constraints.Null;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/CustomUriConnegFilter.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/CustomUriConnegFilter.java
index e80aec22..d9a452b4 100644
--- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/CustomUriConnegFilter.java
+++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/CustomUriConnegFilter.java
@@ -37,7 +37,7 @@
 import jakarta.ws.rs.core.PathSegment;
 import jakarta.ws.rs.core.UriInfo;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.glassfish.jersey.message.internal.LanguageTag;
 import org.glassfish.jersey.server.ResourceConfig;
diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/auth/ApiKeyAuthFilter.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/auth/ApiKeyAuthFilter.java
index def99b2a..a16064ce 100644
--- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/auth/ApiKeyAuthFilter.java
+++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/auth/ApiKeyAuthFilter.java
@@ -1,15 +1,11 @@
 package eu.clarin.cmdi.virtualcollectionregistry.rest.auth;
 
-import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyException;
-import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyNotFoundException;
-import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyRevokedException;
 import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyService;
-import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;