diff --git a/Jenkinsfile b/Jenkinsfile
index c148948cdb66e9d6dd9fd188d4772daf0c76c3dc..8067b2b13cf8a55649df6c6a7909d9518ea0daaf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent {
         node {
-            label 'ozgcloud-jenkins-build-agent'
+            label 'ozgcloud-jenkins-build-agent-jdk21'
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 895e31b0d688877b9b530c5c005521206810b344..d320766c93782dfcba189622247edf423051d886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>3.0.1</version>
+		<version>4.0.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -44,19 +44,16 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
-		<jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
-		<jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
-		<lombok.version>1.18.24</lombok.version>
-		<keycloak-adapter.version>22.0.5</keycloak-adapter.version>
+		<lombok.version>1.18.30</lombok.version>
 
 		<!-- plugins -->
-		<maven.compiler.release>17</maven.compiler.release>
+		<maven.compiler.release>21</maven.compiler.release>
 		<jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
-		<compiler-plugin.version>3.8.1</compiler-plugin.version>
-		<jacoco.plugin.version>0.8.8</jacoco.plugin.version>
-		<surefire-plugin.version>3.2.2</surefire-plugin.version>
-		<maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
-		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+		<compiler-plugin.version>3.11.0</compiler-plugin.version>
+		<jacoco.plugin.version>0.8.11</jacoco.plugin.version>
+		<surefire-plugin.version>3.2.5</surefire-plugin.version>
+		<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
+		<git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
 		<maven-source.plugin.version>3.3.0</maven-source.plugin.version>
 	</properties>
 
@@ -87,12 +84,12 @@
 			<dependency>
 				<groupId>jakarta.interceptor</groupId>
 				<artifactId>jakarta.interceptor-api</artifactId>
-				<version>${jakarta.interceptor.version}</version>
+				<version>${jakarta.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.annotation</groupId>
 				<artifactId>jakarta.annotation-api</artifactId>
-				<version>${jakarta.annotatioin.version}</version>
+				<version>${jakarta.version}</version>
 			</dependency>
 
 			<!-- Mapstruct -->
@@ -181,9 +178,9 @@
 					<version>${maven-failsafe-plugin.version}</version>
 				</plugin>
 				<plugin>
-					<groupId>pl.project13.maven</groupId>
-					<artifactId>git-commit-id-plugin</artifactId>
-					<version>${git-commit-id-plugin.version}</version>
+					<groupId>io.github.git-commit-id</groupId>
+					<artifactId>git-commit-id-maven-plugin</artifactId>
+					<version>${git-commit-id-maven-plugin.version}</version>
 					<executions>
 						<execution>
 							<id>get-the-git-infos</id>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index bdf2cfc8503a661e768b8c85b5b1126d4eae69da..3229b0b6b0eca874417c8eff5207a7dffb1547bb 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -239,8 +239,8 @@
 				<extensions>true</extensions>
 			</plugin>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>