diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
index cf79e40328ceddd314d9841b7e95ceb0b0731a1c..c243a89641e1ca5589188a680ed0ace8536fb747 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
@@ -28,15 +28,17 @@ import java.time.ZonedDateTime;
 public class FormHeaderTestFactory {
 
 	public static final String CLIENT_ID = "clientId";
-	public static final String CLIENT = "client";
+//	public static final String CLIENT = "client";
 	public static final String CUSTOMER_ID = "customerId";
 	public static final String CUSTOMER = "customer";
 	public static final String SENDER = "sender";
+	public static final String FORM_ENGINE_NAME = "TB3000";
 	public static final String FORM_NAME = "formName";
 	public static final String FORM_ID = "formId";
 	public static final String REQUEST_ID = "requestId";
 	public static final String VORGANG_NUMMER = "ABCD-1234";
-	public static final ZonedDateTime CREATED_AT = ZonedDateTime.now();
+	public static final String CREATED_AT_STR = "2024-04-01T01:00:30Z";
+	public static final ZonedDateTime CREATED_AT = ZonedDateTime.parse(CREATED_AT_STR);
 
 	public static FormHeader create() {
 		return createBuilder().build();
@@ -47,6 +49,7 @@ public class FormHeaderTestFactory {
 				.requestId(REQUEST_ID)
 				.vorgangNummer(VORGANG_NUMMER)
 				.createdAt(CREATED_AT)
+				.formEngineName(FORM_ENGINE_NAME)
 				.formId(FORM_ID)
 				.formName(FORM_NAME)
 				.sender(SENDER)
diff --git a/pom.xml b/pom.xml
index 6352b803dc5ce3fe725de6bd347886d279632266..16d30f7f1eb64274acd690306c2e16abf5517b5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 	<properties>
 		<mapstruct.version>1.4.2.Final</mapstruct.version>
 
-		<vorgang-manager.version>2.0.0</vorgang-manager.version>
+		<vorgang-manager.version>2.4.0-SNAPSHOT</vorgang-manager.version>
 
 		<jsoup.version>1.14.3</jsoup.version>
 		<xmlschema.version>2.3.0</xmlschema.version>
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangHeaderTestFactory.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangHeaderTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..a19f2a9022216a84831f74551a98fda727e0f8e3
--- /dev/null
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangHeaderTestFactory.java
@@ -0,0 +1,25 @@
+package de.ozgcloud.eingang.router;
+
+import static de.ozgcloud.eingang.common.formdata.FormHeaderTestFactory.*;
+
+import de.ozgcloud.vorgang.vorgang.GrpcEingangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto;
+
+public class GrpcEingangHeaderTestFactory {
+
+	public static GrpcEingangHeader create() {
+		return createBuilder().build();
+	}
+
+	public static GrpcEingangHeader.Builder createBuilder() {
+		return GrpcEingangHeader.newBuilder()
+				.setRequestId(REQUEST_ID)
+				.setCreatedAt(CREATED_AT_STR)
+				.setFormId(FORM_ID)
+				.setFormEngineName(FORM_ENGINE_NAME)
+				.setFormName(FORM_NAME)
+				.setSender(SENDER)
+				.setServiceKonto(GrpcServiceKonto.newBuilder().build())
+				.setVorgangNummer(VORGANG_NUMMER);
+	}
+}
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
index 763dc797ec675ca28964e2fa3d9cffe2cac80e09..b0348cc39fa405d1b7ea467d6d99e2a5ee5db4f0 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
@@ -192,6 +192,18 @@ class GrpcEingangMapperTest {
 			}
 		}
 
+		@Nested
+		@DisplayName("Test mapped Header")
+		class TestHeader {
+			@Test
+			void shouldMapAllFields() {
+				var header = toEingang().getHeader();
+
+				assertThat(header).usingRecursiveAssertion().isEqualTo(GrpcEingangHeaderTestFactory.create());
+
+			}
+		}
+
 		private GrpcEingang toEingang() {
 			return mapper.toEingang(FormDataTestFactory.create());
 		}