diff --git a/Jenkinsfile b/Jenkinsfile
index 89a513ae03d2827c8f7802a336d9bb6fce4085fa..f28561ef01011852566b67659718aa65eafad4aa 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/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index 097ea2fbad1033563781981faa9e3e00c6c94ac9..82a2b6b61260300a5535f3d35fa4a5fbf0d0aab0 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>3.0.0</version>
+		<version>4.0.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -40,7 +40,7 @@
 	
 	<properties>
 		<vorgang-manager.version>2.0.0</vorgang-manager.version>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 	</properties>
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index 4d68cfca0c9dd9550a9371405caffefe11419b07..96cf1038df4511619272922c6b1e83eef55ddfa1 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -50,7 +50,6 @@
 		<dependency>
 			<groupId>de.ozgcloud.eingang</groupId>
 			<artifactId>router</artifactId>
-			<version>${vorgang-manager.version}</version>
 		</dependency>
 
 		<!-- spring -->
@@ -58,6 +57,10 @@
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-server-spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-inprocess</artifactId>
+		</dependency>
 
 		<!-- Tools -->
 		<dependency>
diff --git a/pom.xml b/pom.xml
index f10f9c5cabe450bb439bffa749c32494fea559db..3642f2b3fd074de68e2fd642a512c1f8d203ae5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>3.0.0</version>
+		<version>4.0.1-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -54,8 +54,6 @@
 	</modules>
 
 	<properties>
-		<mapstruct.version>1.4.2.Final</mapstruct.version>
-
 		<vorgang-manager.version>2.4.0</vorgang-manager.version>
 
 		<jsoup.version>1.14.3</jsoup.version>
diff --git a/router/pom.xml b/router/pom.xml
index cabec582793dcc3546e070d7929613bd2f1dcd47..add9ec110aa2829586ed9569603d979c819de49c 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -56,6 +56,10 @@
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-client-spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-inprocess</artifactId>
+		</dependency>
 
 		<!-- Tools -->
 		<dependency>