diff --git a/TDItoRP_TrackingETAUpdated.ftl b/TDItoRP_TrackingETAUpdated.ftl
index f4ff9ec..793d3f2 100644
--- a/TDItoRP_TrackingETAUpdated.ftl
+++ b/TDItoRP_TrackingETAUpdated.ftl
@@ -9,12 +9,12 @@
         "Payload": {
             "TrackingETA": {
                 "EndETA": {
-                    "AuthorTimeZone": "Europe/Paris",
-                    "DateTime": "2023-01-01T00:00:00Z"
+                    "AuthorTimeZone": "UTC",
+                    "DateTime": "${tdiEvent.EstimatedDeliveryDate}"
                 },
                 "StartETA": {
-                    "AuthorTimeZone": "Europe/Paris",
-                    "DateTime": "2023-01-01T00:00:00Z"
+                    "AuthorTimeZone": "UTC",
+                    "DateTime": "${tdiEvent.EstimatedDeliveryDate}"
                 }
             }
         }