diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
index be450d87ce5ffa35b8a884eb888224759b68880a..9ddc1287c6c7433070c59de09264b0f8156bcc75 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
@@ -1,5 +1,14 @@
 package de.ozgcloud.eingang.semantik.formbased.mantelantrag;
 
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
+
+import org.apache.commons.collections.MapUtils;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
 import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormHeader;
@@ -7,14 +16,6 @@ import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
 import de.ozgcloud.eingang.semantik.formbased.FormBasedMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.UnaryOperator;
-import java.util.stream.IntStream;
 
 @Component
 @RequiredArgsConstructor
@@ -36,7 +37,7 @@ public class MantelantragZustaendigeStelleMapper implements FormBasedMapper {
 	public boolean isResponsible(FormData formData) {
 		return Optional.ofNullable(formData.getHeader())
 				.map(FormHeader::getFormId)
-				.map(MANTELANTRAG_FORM_ID::equals)
+				.map(v -> v.startsWith(MANTELANTRAG_FORM_ID))
 				.orElse(false);
 	}
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
index e04fba257b1d9e65552eabcd78b8e633d329b9a8..f03169a6704aae741e3234b82aff876448b027d6 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
@@ -43,10 +43,11 @@ class MantelantragZustaendigeStelleMapperTest {
 	@Nested
 	class TestIsResponsible {
 
-		@DisplayName("should be true if mantelantrag form id")
-		@Test
-		void shouldBeTrueIfMantelantragFormId() {
-			var formData = createWithFormId(MANTELANTRAG_FORM_ID);
+		@DisplayName("should be true if mantelantrag starts with form id")
+		@ParameterizedTest
+		@ValueSource(strings = { MANTELANTRAG_FORM_ID, MANTELANTRAG_FORM_ID + "_pvog" })
+		void shouldBeTrueIfMantelantragStartsWithFormId(String formId) {
+			var formData = createWithFormId(formId);
 
 			var isResponsibleResult = mapper.isResponsible(formData);