diff --git a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/BulkIngesterE2eTest.java b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/BulkIngesterE2eTest.java
index f8bdebf31..9c834dffc 100644
--- a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/BulkIngesterE2eTest.java
+++ b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/BulkIngesterE2eTest.java
@@ -104,7 +104,7 @@ void shouldIncludeBasicProperties()
             assertEquals(nodeId, event.get("objectId").asText());
             assertEquals(sourceId, event.get("sourceId").asText());
             assertEquals(eventType, event.get("eventType").asText());
-            assertTrue(event.has("timestamp"));
+            assertTrue(event.has("sourceTimestamp"));
             assertTrue(event.has("properties"));
         }, 15, 200);
     }
diff --git a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
index c8bdaecfe..19b680a8e 100644
--- a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
+++ b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/CreateNodeE2eTest.java
@@ -161,7 +161,7 @@ final void testCreateNodeContainingImageFile() throws IOException
 
             WireMock.verify(exactly(1), postRequestedFor(urlEqualTo("/presigned-urls")));
             WireMock.verify(moreThanOrExactly(2), postRequestedFor(urlEqualTo("/ingestion-events"))
-                    .withRequestBody(containing(createdNode.id()).and(containing("timestamp")))
+                    .withRequestBody(containing(createdNode.id()).and(containing("sourceTimestamp")))
                     .withHeader(USER_AGENT, matching(getAppInfoRegex())));
         }, INITIAL_DELAY_MS);
     }
@@ -189,7 +189,7 @@ final void testCreateNodeContainingTextFile() throws IOException
 
             WireMock.verify(exactly(1), postRequestedFor(urlEqualTo("/presigned-urls")));
             WireMock.verify(moreThanOrExactly(2), postRequestedFor(urlEqualTo("/ingestion-events"))
-                    .withRequestBody(containing(createdNode.id()).and(containing("timestamp")))
+                    .withRequestBody(containing(createdNode.id()).and(containing("sourceTimestamp")))
                     .withHeader(USER_AGENT, matching(getAppInfoRegex())));
         }, INITIAL_DELAY_MS);
     }
diff --git a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/DeleteNodeE2eTest.java b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/DeleteNodeE2eTest.java
index 30b3b4540..d03b371ef 100644
--- a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/DeleteNodeE2eTest.java
+++ b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/DeleteNodeE2eTest.java
@@ -116,7 +116,7 @@ void testReceiveDeleteEvent() throws IOException
         RetryUtils.retryWithBackoff(() -> verify(exactly(1), postRequestedFor(urlEqualTo("/ingestion-events"))
                 .withRequestBody(containing("\"objectId\":\"%s\"".formatted(createdNode.id())))
                 .withRequestBody(containing("\"sourceId\":\"alfresco-dummy-source-id-0a63de491876\""))
-                .withRequestBody(containing("\"timestamp\""))
+                .withRequestBody(containing("\"sourceTimestamp\""))
                 .withRequestBody(containing("\"eventType\":\"delete\""))
                 .withHeader(USER_AGENT, matching(getAppInfoRegex()))), DELAY_MS);
     }
diff --git a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/UpdateNodeE2eTest.java b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/UpdateNodeE2eTest.java
index a199d0e70..b7989a156 100644
--- a/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/UpdateNodeE2eTest.java
+++ b/e2e-test/src/test/java/org/alfresco/hxi_connector/e2e_test/UpdateNodeE2eTest.java
@@ -236,7 +236,7 @@ final void testSendTimestampToHxi()
         // then
         RetryUtils.retryWithBackoff(() -> verify(exactly(1), postRequestedFor(urlEqualTo("/ingestion-events"))
                 .withRequestBody(containing(updatedNode.id()))
-                .withRequestBody(containing("timestamp"))
+                .withRequestBody(containing("sourceTimestamp"))
                 .withHeader(USER_AGENT, matching(getAppInfoRegex()))));
     }
 
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventIntegrationTest.java
index 10b263ca8..6f6dfc97c 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventIntegrationTest.java
@@ -69,7 +69,7 @@ void shouldIngestOnlyMetadataIfThereIsNoContent()
                     "objectId" : "5018ff83-ec45-4a11-95c4-681761752aa7",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType" : "create",
-                    "timestamp": 1707153500,
+                    "sourceTimestamp": 1707153500,
                     "properties" : {
                       "type": {"value": "cm:category"},
                       "createdAt": {"value": 1707153552},
@@ -122,7 +122,7 @@ void shouldIngestMetadataAndContent()
                     "objectId" : "37be157c-741c-4e51-b781-20d36e4e335a",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType" : "create",
-                    "timestamp": 1308061016,
+                    "sourceTimestamp": 1308061016,
                     "properties" : {
                       "type": {"value": "cm:content"},
                       "createdBy": {"value": "admin"},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventMatchingContentMappingIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventMatchingContentMappingIntegrationTest.java
index 6899ef117..2848067bc 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventMatchingContentMappingIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventMatchingContentMappingIntegrationTest.java
@@ -83,7 +83,7 @@ void givenMappingForImage_whenContentWithMatchingTypeIngested_thenProcessWithTra
                     "objectId" : "37be157c-741c-4e51-b781-20d36e4e335a",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType" : "create",
-                    "timestamp": %s,
+                    "sourceTimestamp": %s,
                     "properties" : {
                       "type": {"value": "cm:content"},
                       "createdBy": {"value": "admin"},
@@ -168,7 +168,7 @@ void givenMappingForNonImage_whenContentWithMatchingTypeIngested_thenProcessWith
                     "objectId" : "37be157c-741c-4e51-b781-20d36e4e335a",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType" : "create",
-                    "timestamp": %s,
+                    "sourceTimestamp": %s,
                     "properties" : {
                       "type": {"value": "cm:content"},
                       "createdBy": {"value": "admin"},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventNonMatchingContentMappingIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventNonMatchingContentMappingIntegrationTest.java
index fbbb11e08..f0ced9f83 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventNonMatchingContentMappingIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/bulk_ingester/BulkIngesterEventNonMatchingContentMappingIntegrationTest.java
@@ -77,7 +77,7 @@ void givenExactAndWildcardMimeTypeMappingForContentConfigured_whenContentWithNot
                     "objectId" : "37be157c-741c-4e51-b781-20d36e4e335a",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType" : "create",
-                    "timestamp" : %s,
+                    "sourceTimestamp" : %s,
                     "properties" : {
                       "type": {"value": "cm:content"},
                       "createdBy": {"value": "admin"},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/CreateRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/CreateRequestIntegrationTest.java
index 5bbfb50f0..2de5f3c7b 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/CreateRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/CreateRequestIntegrationTest.java
@@ -93,7 +93,7 @@ void testCreateRequest()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp": 1611227656423,
+                    "sourceTimestamp": 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1611227655695},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/DeleteRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/DeleteRequestIntegrationTest.java
index 71b137286..0f72cd973 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/DeleteRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/DeleteRequestIntegrationTest.java
@@ -64,7 +64,7 @@ void testDeleteRequest()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "delete",
-                    "timestamp": 1611656982995
+                    "sourceTimestamp": 1611656982995
                 }""";
         containerSupport.expectHxIngestMessageReceived(expectedBody);
     }
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/MatchingContentMappingRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/MatchingContentMappingRequestIntegrationTest.java
index 8c01fb4e5..6a2e5e45f 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/MatchingContentMappingRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/MatchingContentMappingRequestIntegrationTest.java
@@ -101,7 +101,7 @@ void givenMappingForImage_whenContentWithMatchingTypeIngested_thenProcessWithTra
                     "objectId": "d71dd823-01c7-477c-8490-04cb0e826e61",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp" : 1611227656423,
+                    "sourceTimestamp" : 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1611227655695},
@@ -209,7 +209,7 @@ void givenMappingForNonImage_whenContentWithMatchingTypeIngested_thenProcessWith
                     "objectId": "d71dd823-01c7-477c-8490-04cb0e826e61",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp" : 1611227656423,
+                    "sourceTimestamp" : 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1611227655695},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/NonMatchingContentMappingRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/NonMatchingContentMappingRequestIntegrationTest.java
index a6f520d1d..67d259020 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/NonMatchingContentMappingRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/NonMatchingContentMappingRequestIntegrationTest.java
@@ -97,7 +97,7 @@ void givenExactAndWildcardMimeTypeMappingForContentConfigured_whenContentWithNot
                     "objectId": "d71dd823-01c7-477c-8490-04cb0e826e61",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp": 1611227656423,
+                    "sourceTimestamp": 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1611227655695},
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/PredictionRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/PredictionRequestIntegrationTest.java
index c7d8f983c..72ef46647 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/PredictionRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/PredictionRequestIntegrationTest.java
@@ -296,7 +296,7 @@ void testUpdateRequestWithPredictionPreviouslyApplied()
                     "objectId": "34563456-3456-3456-3456-345634563456",
                     "eventType": "update",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
-                    "timestamp" : %s,
+                    "sourceTimestamp" : %s,
                     "properties": {
                        "createdAt" : {
                          "value" : 1611227655695
@@ -413,7 +413,7 @@ void testPredictionNodeConfirmedByUserRaisesHxIEventAgainstParent()
                     "objectId": "5f355d16-f824-4173-bf4b-b1ec37ef5549",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": %s,
+                    "sourceTimestamp": %s,
                     "properties": {
                       "cm:description": {"value": "predicted value"}
                     }
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RenditionTransferIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RenditionTransferIntegrationTest.java
index a9e35ada1..4a48e1557 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RenditionTransferIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RenditionTransferIntegrationTest.java
@@ -62,7 +62,7 @@ void testTransferRendition()
                     "objectId": "f71dd823-82c7-477c-8490-04cb0e826e67",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1308061016,
+                    "sourceTimestamp": 1308061016,
                     "properties": {
                       "cm:content": {
                         "file": {
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RequestFiltersIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RequestFiltersIntegrationTest.java
index 1a6ee53ce..1bbff4964 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RequestFiltersIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/RequestFiltersIntegrationTest.java
@@ -105,7 +105,7 @@ void testCreateRequestWithAspectInAllowedFilterAndTypeInAllowedFilterAndAncestor
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e01",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp": 1611227656423,
+                    "sourceTimestamp": 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1709378055695},
@@ -262,7 +262,7 @@ void testCreateRequestWithAtLeastOneAspectPresentInAllowedFilterAndTypeInAllowed
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e03",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "create",
-                    "timestamp": 1611227656423,
+                    "sourceTimestamp": 1611227656423,
                     "properties": {
                       "cm:autoVersion": {"value": true},
                       "createdAt": {"value": 1709378055695},
@@ -424,7 +424,7 @@ void testUpdateRequestWithAspectInAllowedFilterAndTypeInAllowedFilterAndAncestor
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e05",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties": {
                       "cm:title": {"value": "Purchase Order"},
                       "aspectsNames": {"value" : [ "cm:versionable", "cm:auditable" ]},
@@ -616,7 +616,7 @@ void testUpdateRequestWithAtLeastOneAspectInAllowedFilterAndTypeInAllowedFilterA
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e07",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties": {
                       "cm:title": {"value": "Purchase Order"},
                       "aspectsNames": {"value" : [ "cm:versionable", "cm:author", "cm:titled", "cm:classifiable" ]},
@@ -1047,7 +1047,7 @@ void testUpdateRequestWithAspectInAllowedFilterAndTypeInAllowedFilterAndAncestor
                      "objectId" : "d71dd823-82c7-477c-8490-04cb0e826e13",
                      "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                      "eventType" : "create",
-                     "timestamp": 1611656982995,
+                     "sourceTimestamp": 1611656982995,
                      "properties" : {
                        "cm:title" : {
                          "value" : "Purchase Order"
@@ -1173,7 +1173,7 @@ void testUpdateRequestWithAspectInAllowedFilterAndTypeInAllowedFilterAndAncestor
                   {
                       "objectId" : "d71dd823-82c7-477c-8490-04cb0e826e14",
                       "sourceId" : "alfresco-dummy-source-id-0a63de491876",
-                      "timestamp": 1611656982995,
+                      "sourceTimestamp": 1611656982995,
                       "eventType" : "delete"
                     }
                 """;
@@ -1255,7 +1255,7 @@ void testUpdateRequestWithAspectModifiedToFitDeniedFilterAndTypeInAllowedFilterA
                   {
                       "objectId" : "d71dd823-82c7-477c-8490-04cb0e826e15",
                       "sourceId" : "alfresco-dummy-source-id-0a63de491876",
-                      "timestamp" : 1611656982995,
+                      "sourceTimestamp" : 1611656982995,
                       "eventType" : "delete"
                     }
                 """;
@@ -1332,7 +1332,7 @@ void testUpdateRequestWithAspectModifiedToFitAllowedFilterAndTypeInAllowedFilter
                      "objectId" : "d71dd823-82c7-477c-8490-04cb0e826e16",
                      "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                      "eventType" : "create",
-                     "timestamp": 1611656982995,
+                     "sourceTimestamp": 1611656982995,
                      "properties" : {
                        "cm:title" : {
                          "value" : "Purchase Order"
diff --git a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/UpdateRequestIntegrationTest.java b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/UpdateRequestIntegrationTest.java
index 53b187e41..4d1f5e7d2 100644
--- a/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/UpdateRequestIntegrationTest.java
+++ b/live-ingester/src/integration-test/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/e2e/repository/UpdateRequestIntegrationTest.java
@@ -108,7 +108,7 @@ void testUpdateRequest()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp" : 1611656982995,
+                    "sourceTimestamp" : 1611656982995,
                     "properties": {
                       "cm:title": {"value": "Purchase Order"},
                       "aspectsNames": {"value": ["cm:versionable", "cm:author", "cm:titled"]},
@@ -218,7 +218,7 @@ void testContentUpdateRequest()
                             "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                             "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                             "eventType": "update",
-                            "timestamp": 1611656982995,
+                            "sourceTimestamp": 1611656982995,
                             "properties": {
                               "createdAt" : {
                                 "value" : 1611227655695
@@ -291,7 +291,7 @@ void shouldCreateProperty()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties": {
                       "cm:title": {"value": "Purchase Order"},
                       "createdAt" : {
@@ -366,7 +366,7 @@ void shouldUpdateProperty()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties": {
                       "cm:title": {"value": "Summary for year 2024"},
                       "createdAt" : {
@@ -441,7 +441,7 @@ void shouldDeleteProperty()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp" : 1611656982995,
+                    "sourceTimestamp" : 1611656982995,
                     "properties": {
                         "createdAt" : {
                           "value" : 1611227655695
@@ -534,7 +534,7 @@ void shouldMapTagsAndCategoriesToJustIds()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties": {
                       "cm:taggable": {"value": ["51d0b636-3c3b-4e33-ba1f-098474f53e8c"]},
                       "cm:categories": {"value": ["a9f57ef6-2acf-4b2a-ae85-82cf552bec58"]},
@@ -683,7 +683,7 @@ void testRemovingContentFromNode()
                     "objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1611656982995,
+                    "sourceTimestamp": 1611656982995,
                     "properties" : {
                       "cm:title" : {
                         "value" : "Purchase Order"
@@ -777,7 +777,7 @@ void testLogInEvent()
                     "objectId": "321d84e3-a5fe-431e-92f5-f8e09480305e",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp": 1704798873615,
+                    "sourceTimestamp": 1704798873615,
                     "properties": {
                       "aspectsNames": {"value": ["cm:preferences", "cm:ownable"]},
                       "cm:homeFolderProvider" : {
@@ -860,7 +860,7 @@ void testUpdateFolderName()
                     "objectId": "82c7d723-1dd8-477c-8490-04cb0e826e65",
                     "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                     "eventType": "update",
-                    "timestamp" : 1611656982995,
+                    "sourceTimestamp" : 1611656982995,
                     "properties": {
                       "cm:name": {"value": "New Folder"},
                       "createdAt" : {
@@ -978,7 +978,7 @@ void testUpdatePermissions()
                   "objectId" : "9f3380e3-b9b1-4b01-b1c6-ef1f717a9abb",
                   "sourceId" : "alfresco-dummy-source-id-0a63de491876",
                   "eventType" : "update",
-                  "timestamp" : 1722422055416,
+                  "sourceTimestamp" : 1722422055416,
                   "properties" : {
                     "ALLOW_ACCESS" : {
                       "value" : [ "GROUP_EVERYONE", "abeecher" ]
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/DeleteNodeEventSerializer.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/DeleteNodeEventSerializer.java
index 3136108ac..53708028e 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/DeleteNodeEventSerializer.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/DeleteNodeEventSerializer.java
@@ -56,7 +56,7 @@ public void serialize(DeleteNodeEvent event, JsonGenerator jgen, SerializerProvi
 
             jgen.writeStringField("objectId", event.getObjectId());
             jgen.writeStringField("sourceId", event.getSourceId());
-            jgen.writeNumberField("timestamp", event.getTimestamp());
+            jgen.writeNumberField("sourceTimestamp", event.getTimestamp());
 
             jgen.writeStringField("eventType", "delete");
 
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializer.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializer.java
index f2b04d557..ef2c45088 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializer.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializer.java
@@ -71,7 +71,7 @@ public void serialize(UpdateNodeEvent event, JsonGenerator jgen, SerializerProvi
             jgen.writeStringField("sourceId", event.getSourceId());
 
             jgen.writeStringField("eventType", serializeEventType(event.getEventType()));
-            jgen.writeNumberField("timestamp", event.getTimestamp());
+            jgen.writeNumberField("sourceTimestamp", event.getTimestamp());
 
             if (!event.getMetadataPropertiesToSet().isEmpty() || !event.getContentPropertiesToSet().isEmpty())
             {
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommand.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommand.java
index 8b014b79d..9c1cc83d9 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommand.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommand.java
@@ -30,11 +30,11 @@
 
 public record DeleteNodeCommand(
         String nodeId,
-        long timestamp)
+        long sourceTimestamp)
 {
     public DeleteNodeCommand
     {
         ensureNotBlank(nodeId, "Node id cannot be blank.");
-        ensureThat(timestamp > 0, "Timestamp cannot be negative or zero.");
+        ensureThat(sourceTimestamp > 0, "Source timestamp cannot be negative or zero.");
     }
 }
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommandHandler.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommandHandler.java
index a50cc9ecb..99293c887 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommandHandler.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/delete/DeleteNodeCommandHandler.java
@@ -45,7 +45,7 @@ public void handle(DeleteNodeCommand deleteNodeCommand)
     {
         String nodeId = deleteNodeCommand.nodeId();
         log.debug("Processing delete command for {}", nodeId);
-        DeleteNodeEvent deleteNodeEvent = new DeleteNodeEvent(nodeId, integrationProperties.application().getSourceId(), deleteNodeCommand.timestamp());
+        DeleteNodeEvent deleteNodeEvent = new DeleteNodeEvent(nodeId, integrationProperties.application().getSourceId(), deleteNodeCommand.sourceTimestamp());
         ingestionEngineEventPublisher.publishMessage(deleteNodeEvent);
     }
 }
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommand.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommand.java
index 68bda30d8..af79895dd 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommand.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommand.java
@@ -39,13 +39,13 @@ public record IngestNodeCommand(
         String nodeId,
         EventType eventType,
         Set<PropertyDelta<?>> properties,
-        long timestamp)
+        long sourceTimestamp)
 {
     public IngestNodeCommand
     {
         ensureNotBlank(nodeId, "Node id cannot be blank");
         ensureNonNull(eventType, "Node %s event type cannot be null", nodeId);
         ensureNonNull(properties, "Node %s properties delta cannot be null", nodeId);
-        ensureThat(timestamp > 0, "Timestamp cannot be negative or zero.");
+        ensureThat(sourceTimestamp > 0, "Source sourceTimestamp cannot be negative or zero.");
     }
 }
diff --git a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommandHandler.java b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommandHandler.java
index 5677e49a6..6184a4ce7 100644
--- a/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommandHandler.java
+++ b/live-ingester/src/main/java/org/alfresco/hxi_connector/live_ingester/domain/usecase/metadata/IngestNodeCommandHandler.java
@@ -61,7 +61,7 @@ public void handle(IngestNodeCommand command)
                 command.nodeId(),
                 eventType,
                 integrationProperties.application().getSourceId(),
-                command.timestamp());
+                command.sourceTimestamp());
 
         command.properties()
                 .stream()
diff --git a/live-ingester/src/test/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializerTest.java b/live-ingester/src/test/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializerTest.java
index cf6c11d3a..57c425582 100644
--- a/live-ingester/src/test/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializerTest.java
+++ b/live-ingester/src/test/java/org/alfresco/hxi_connector/live_ingester/adapters/config/jackson/UpdateNodeEventSerializerTest.java
@@ -64,7 +64,7 @@ public void shouldSerializeEmptyEvent()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "create",
-                    "timestamp": 1724225729830
+                    "sourceTimestamp": 1724225729830
                   }
                 ]""".formatted(NODE_ID, SOURCE_ID);
         String actualJson = serialize(emptyEvent);
@@ -85,7 +85,7 @@ public void shouldSerializePropertiesToSet()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "create",
-                    "timestamp": 1724225729830,
+                    "sourceTimestamp": 1724225729830,
                     "properties": {
                       "createdAt": {"value": 10000},
                       "modifiedBy": {"value": "000-000-000"}
@@ -110,7 +110,7 @@ public void shouldSerializePropertiesToUnset()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "update",
-                    "timestamp": 1724225729830,
+                    "sourceTimestamp": 1724225729830,
                     "removedProperties": [ "createdAt", "modifiedBy" ]
                   }
                 ]""".formatted(NODE_ID, SOURCE_ID);
@@ -132,7 +132,7 @@ public void canCopeWithNullUsers()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "create",
-                    "timestamp": 1724225729830,
+                    "sourceTimestamp": 1724225729830,
                     "properties": {
                       "createdBy": {"value": null},
                       "modifiedBy": {"value": null}
@@ -157,7 +157,7 @@ public void shouldSetContentProperty()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "create",
-                    "timestamp": 1724225729830,
+                    "sourceTimestamp": 1724225729830,
                     "properties": {
                       "cm:content": {
                         "file": {
@@ -191,7 +191,7 @@ public void shouldOnlySendUpdatedContentMetadata()
                     "objectId": "%s",
                     "sourceId": "%s",
                     "eventType": "create",
-                    "timestamp": 1724225729830,
+                    "sourceTimestamp": 1724225729830,
                     "properties": {
                       "cm:content": {
                         "file": {