diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java b/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
index b3a0adb50f69c6afbbd92e36f2a0ffc5f2c874ce..1cbfe6598e4bf1ec48b010477c565b16d117cef6 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
@@ -29,12 +29,13 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.time.ZonedDateTime;
 
+import de.ozgcloud.xta.client.model.XtaMessageMetaData;
+
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class XtaMapperHelper {
 
-    public static String getFormEngineName(de.ozgcloud.xta.client.model.XtaMessageMetaData metaData) {
+    public static String getFormEngineName(XtaMessageMetaData metaData) {
         if (StringUtils.equals(metaData.messageTypeCode(), XtaService.XDOMEA_0201_MESSAGE_TYPE)) {
-            // TODO OZG-5778 verify the correct engine name
             return "XDOMEA";
         }
 
@@ -46,7 +47,6 @@ public class XtaMapperHelper {
 
     public static String getFormEngineName(XtaFormMetaData metaData) {
         if (StringUtils.equals(metaData.getMessageType(), XtaService.XDOMEA_0201_MESSAGE_TYPE)) {
-            // TODO OZG-5778 verify the correct engine name
             return "XDOMEA";
         }
 
@@ -56,16 +56,13 @@ public class XtaMapperHelper {
         return null;
     }
 
-    // TODO OZG-6176 Check if the problem can be fixed elsewhere
     public static ZonedDateTime getCreatedAt(de.ozgcloud.xta.client.model.XtaMessageMetaData metaData) {
-        // TODO add deliveryOrigin in xta-client-lib
-        /*if (metaData.deliveryOrigin() != null) {
-            return metaData.deliveryOrigin();
-        }*/
+        if (metaData.deliveryAttributesOrigin() != null) {
+            return metaData.deliveryAttributesOrigin();
+        }
         return ZonedDateTime.now();
     }
 
-    // TODO OZG-6176 Check if the problem can be fixed elsewhere
     public static ZonedDateTime getCreatedAt(XtaFormMetaData metaData) {
         if (metaData.getOrigin() != null) {
             return metaData.getOrigin();