diff --git a/perun-oidc-server/pom.xml b/perun-oidc-server/pom.xml
index 631157674..27db9660f 100644
--- a/perun-oidc-server/pom.xml
+++ b/perun-oidc-server/pom.xml
@@ -120,8 +120,8 @@
 			<artifactId>javax.annotation-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.directory.api</groupId>
diff --git a/pom.xml b/pom.xml
index 9fefde763..820ba5ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,11 +90,8 @@
 		<shedlock-provider-jdbc-template.version>${shedlock.version}</shedlock-provider-jdbc-template.version>
 
 		<!-- Servlet -->
-		<jsp-api.version>2.3.3</jsp-api.version>
-		<servlet-api.version>2.5</servlet-api.version>
-		<jstl.version>1.2</jstl.version>
-		<jakarta-servlet-api.version>4.0.4</jakarta-servlet-api.version>
 		<jakarta-jstl.version>1.2.6</jakarta-jstl.version>
+		<jakarta-servlet-api.version>4.0.4</jakarta-servlet-api.version>
 
 		<!-- Eclipse -->
 		<eclipse-persistence.version>2.7.9</eclipse-persistence.version>
@@ -105,14 +102,10 @@
 		<apache-directory-api.version>2.1.0</apache-directory-api.version>
 
 		<!-- Logging -->
-		<org.slf4j-version>1.7.30</org.slf4j-version>
-		<log4j-core.version>2.13.3</log4j-core.version>
-		<junit.version>4.13.2</junit.version>
 		<logback.verison>1.2.7</logback.verison>
-		<jul-to-slf4j.version>1.7.32</jul-to-slf4j.version>
 
 		<!-- Testing -->
-		<easymock.version>4.2</easymock.version>
+		<junit.version>4.13.2</junit.version>
 		<mockito.version>3.2.4</mockito.version>
 
 		<lombok.version>1.18.22</lombok.version>
@@ -120,13 +113,7 @@
 		<gson.version>2.8.9</gson.version>
 		<httpclient.version>4.5.13</httpclient.version>
 		<nimbus-jose-jwt.version>8.23</nimbus-jose-jwt.version>
-		<bcprov-jdk15on.version>1.67</bcprov-jdk15on.version>
-		<apache-commons.version>3.12.0</apache-commons.version>
-		<commons-io.version>2.11.0</commons-io.version>
 		<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
-		<janino.version>3.1.6</janino.version>
-		<jakarta-xml-bind-api.version>2.3.3</jakarta-xml-bind-api.version>
-		<jaxb-runtime.version>2.3.5</jaxb-runtime.version>
 		<aspectjweaver.version>1.9.7</aspectjweaver.version>
 
 		<!-- BUILD -->
@@ -188,9 +175,10 @@
 
 			<!-- Servlet -->
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>${servlet-api.version}</version>
+				<groupId>jakarta.servlet</groupId>
+				<artifactId>jakarta.servlet-api</artifactId>
+				<version>${jakarta-servlet-api.version}</version>
+				<scope>provided</scope>
 			</dependency>
 			<!-- Replace this with the 2+ version when migrated to tomcat 10+ -->
 			<dependency>