diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
index 5bef93a2a74a93c891dc9359694838b8cb451c89..c090b773514c9547f55c20ca2cf981abc67ceb86 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
@@ -7,6 +7,17 @@ import de.ozgcloud.eingang.common.formdata.FormData;
 @Component
 public class AfmAntragstellerHeaderMapper {
 
+	static final String HEADER_POSTFACH_ID = "u:saml_legacypostkorbhandle";
+	static final String HEADER_VORNAME = "u:saml_givenname";
+	static final String HEADER_NACHNAME = "u:saml_surename";
+	static final String HEADER_GEBURTSORT = "u:saml_placeofbirth";
+	// TODO: public static final String HEADER_GEBURTSNAME = "u:saml_??";
+	static final String HEADER_EMAIL = "u:saml_mail";
+	static final String HEADER_TELEFON = "u:saml_telephonenumber";
+	static final String HEADER_STRASSE = "u:saml_postaladdress";
+	static final String HEADER_PLZ = "u:saml_postalcode";
+	static final String HEADER_ORT = "u:saml_localityname";
+
 	public FormData parseAntragstellerData(FormData formData) {
 		return formData;
 	}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
index d3705fa4277593df269478566b7f1f221848d59b..b59daddd07d84cfd5743880836dfb15d0b500c62 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
@@ -38,6 +38,16 @@ public class AfmHeaderTestFactory {
 	public static final String FORM = "Kleiner Waffenschein gem. § 10 Abs. 4 Satz 4 Waffengesetz (WaffG)";
 	public static final String SENDER = "afm.schleswig-holstein.de";
 
+	public static final String CUSTOM_POSTFACH_ID = "postfach_id";
+	public static final String CUSTOM_VORNAME = "vorname";
+	public static final String CUSTOM_NACHNAME = "nachname";
+	public static final String CUSTOM_GEBURTSORT = "geburtsort";
+	public static final String CUSTOM_EMAIL = "email";
+	public static final String CUSTOM_TELEFON = "telefon";
+	public static final String CUSTOM_STRASSE = "strasse";
+	public static final String CUSTOM_PLZ = "plz";
+	public static final String CUSTOM_ORT = "ort";
+
 	public static final String POSTFACH_NAME_ID = "name-id-value";
 
 	public static final int REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE_VALUE = 1;
@@ -58,6 +68,21 @@ public class AfmHeaderTestFactory {
 		map.put(AfmHeaderMapper.FORM_ID, FORM_ID);
 		map.put(AfmHeaderMapper.FORM, FORM);
 		map.put(AfmHeaderMapper.SENDER, SENDER);
+		map.putAll(createCustomHeaderMap());
+		return map;
+	}
+
+	public static Map<String, Object> createCustomHeaderMap() {
+		var map = new HashMap<String, Object>();
+		map.put(AfmAntragstellerHeaderMapper.HEADER_POSTFACH_ID, CUSTOM_POSTFACH_ID);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_VORNAME, CUSTOM_VORNAME);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_NACHNAME, CUSTOM_NACHNAME);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_GEBURTSORT, CUSTOM_GEBURTSORT);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_EMAIL, CUSTOM_EMAIL);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_TELEFON, CUSTOM_TELEFON);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_STRASSE, CUSTOM_STRASSE);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_PLZ, CUSTOM_PLZ);
+		map.put(AfmAntragstellerHeaderMapper.HEADER_ORT, CUSTOM_ORT);
 		return map;
 	}