diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs
index 0f4f7df08..0c1c5b9f9 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/BuildingLambdaRequest.cs
@@ -14,13 +14,5 @@ protected BuildingLambdaRequest(
             IDictionary<string, object?> metadata)
             : base(messageGroupId, ticketId, ifMatchHeaderValue, provenance, metadata)
         { }
-
-        protected Provenance CommandProvenance => new Provenance(
-            SystemClock.Instance.GetCurrentInstant(),
-            Provenance.Application,
-            Provenance.Reason,
-            Provenance.Operator,
-            Provenance.Modification,
-            Provenance.Organisation);
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs
index 042b3ec70..6e2cd5a09 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingMeasurementLambdaRequest.cs
@@ -33,7 +33,7 @@ public ChangeBuildingMeasurement ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs
index 37877fec8..d507083d1 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/ChangeBuildingOutlineLambdaRequest.cs
@@ -31,7 +31,7 @@ public ChangeBuildingOutline ToCommand()
             return new ChangeBuildingOutline(
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs
index f154a33de..88fb645b3 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingMeasurementLambdaRequest.cs
@@ -37,7 +37,7 @@ public CorrectBuildingMeasurement ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs
index 07dab378b..48ee1a346 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingNotRealizationLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectBuildingNotRealizationLambdaRequest(
         /// <returns>CorrectBuildingNotRealization.</returns>
         public CorrectBuildingNotRealization ToCommand()
         {
-            return new CorrectBuildingNotRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingNotRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs
index fc05cd2b6..51cd2cb5b 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectBuildingRealizationLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectBuildingRealizationLambdaRequest(
         /// <returns>CorrectBuildingRealization.</returns>
         public CorrectBuildingRealization ToCommand()
         {
-            return new CorrectBuildingRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingRealization(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs
index 58b4cb4a2..e3c030e6d 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/CorrectPlaceBuildingUnderConstructionLambdaRequest.cs
@@ -26,7 +26,7 @@ public CorrectPlaceBuildingUnderConstructionLambdaRequest(
         /// <returns>CorrectBuildingPlaceUnderConstruction.</returns>
         public CorrectBuildingPlaceUnderConstruction ToCommand()
         {
-            return new CorrectBuildingPlaceUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingPlaceUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs
index 07cac99c9..968684da3 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/DemolishBuildingLambdaRequest.cs
@@ -30,7 +30,7 @@ public DemolishBuilding ToCommand()
         {
             return new DemolishBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs
index 97f36b7a3..c5538a211 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MeasureBuildingLambdaRequest.cs
@@ -37,7 +37,7 @@ public MeasureBuilding ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs
index e9aee56c4..bf9513bc0 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/MergeBuildingsLambdaRequest.cs
@@ -35,7 +35,7 @@ public MergeBuildings ToCommand()
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.SamenvoegenGebouwen
                     .Select(x => new BuildingPersistentLocalId(Convert.ToInt32(x.AsIdentifier().Map(s => s).Value))),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs
index db92c29f7..502128665 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/NotRealizeBuildingLambdaRequest.cs
@@ -24,7 +24,7 @@ public NotRealizeBuildingLambdaRequest(string messageGroupId, NotRealizeBuilding
         /// <returns>NotRealizeBuilding.</returns>
         public NotRealizeBuilding ToCommand()
         {
-            return new NotRealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new NotRealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs
index ce0cb19e4..ba256a5c7 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlaceBuildingUnderConstructionLambdaRequest.cs
@@ -26,7 +26,7 @@ public PlaceBuildingUnderConstructionLambdaRequest(
         /// <returns>PlaceBuildingUnderConstruction.</returns>
         public PlaceBuildingUnderConstruction ToCommand()
         {
-            return new PlaceBuildingUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new PlaceBuildingUnderConstruction(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs
index ff11be7ea..d468c349a 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/PlanBuildingLambdaRequest.cs
@@ -29,7 +29,7 @@ public PlanBuilding ToCommand()
             return new PlanBuilding(
                 BuildingPersistentLocalId,
                 Request.GeometriePolygoon.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs
index 90661acf5..0857c1663 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeAndMeasureUnplannedBuildingLambdaRequest.cs
@@ -30,7 +30,7 @@ public RealizeAndMeasureUnplannedBuilding ToCommand()
                 new BuildingPersistentLocalId(BuildingPersistentLocalId),
                 Request.GrbData.GeometriePolygoon.ToExtendedWkbGeometry(),
                 Request.GrbData.ToBuildingGrbData(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs
index 9b61c8b16..4085bbf94 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RealizeBuildingLambdaRequest.cs
@@ -26,7 +26,7 @@ public RealizeBuildingLambdaRequest(
         /// <returns>RealizeBuilding.</returns>
         public RealizeBuilding ToCommand()
         {
-            return new RealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new RealizeBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs
index 0a75a4aad..520250b10 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/Building/RemoveBuildingLambdaRequest.cs
@@ -28,7 +28,7 @@ public RemoveBuildingLambdaRequest(string messageGroupId, RemoveBuildingSqsReque
         /// <returns>RemoveBuilding.</returns>
         public RemoveBuilding ToCommand()
         {
-            return new RemoveBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), CommandProvenance);
+            return new RemoveBuilding(new BuildingPersistentLocalId(BuildingPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs
index c7804c493..8b1f8c6cd 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/AttachAddressToBuildingUnitLambdaRequest.cs
@@ -1,9 +1,8 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building.Validators;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building.Validators;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -38,7 +37,7 @@ public AttachAddressToBuildingUnit ToCommand()
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 new AddressPersistentLocalId(addressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs
index 4b5cb490b..f92de3fac 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/BuildingUnitLambdaRequest.cs
@@ -18,13 +18,5 @@ protected BuildingUnitLambdaRequest(
             IDictionary<string, object?> metadata)
             : base(messageGroupId, ticketId, ifMatchHeaderValue, provenance, metadata)
         { }
-
-        protected Provenance CommandProvenance => new Provenance(
-            SystemClock.Instance.GetCurrentInstant(),
-            Provenance.Application,
-            Provenance.Reason,
-            Provenance.Operator,
-            Provenance.Modification,
-            Provenance.Organisation);
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs
index 7542295d3..75d763725 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitDeregulationLambdaRequest.cs
@@ -1,8 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +31,7 @@ public CorrectBuildingUnitDeregulation ToCommand()
             return new CorrectBuildingUnitDeregulation(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs
index 1bd71dd5c..623820a15 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitNotRealizationLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -34,7 +32,7 @@ public CorrectBuildingUnitNotRealization ToCommand()
             return new CorrectBuildingUnitNotRealization(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs
index fe35b9525..9611272e7 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitPositionLambdaRequest.cs
@@ -1,11 +1,9 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building;
+    using Abstractions.BuildingUnit.Converters;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Converters;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -36,7 +34,7 @@ public CorrectBuildingUnitPosition ToCommand()
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 Request.PositieGeometrieMethode.Map(),
                 string.IsNullOrWhiteSpace(Request.Positie) ? null : Request.Positie.ToExtendedWkbGeometry(),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs
index 93a7a3a98..c2b0308ba 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRealizationLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public CorrectBuildingUnitRealizationLambdaRequest(
         /// <returns>CorrectBuildingUnitRealization.</returns>
         public CorrectBuildingUnitRealization ToCommand()
         {
-            return new CorrectBuildingUnitRealization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRealization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs
index db92bd759..035b8086b 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRegularizationLambdaRequest.cs
@@ -1,8 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -27,7 +26,10 @@ public CorrectBuildingUnitRegularizationLambdaRequest(
         /// <returns>CorrectBuildingUnitRealization.</returns>
         public CorrectBuildingUnitRegularization ToCommand()
         {
-            return new CorrectBuildingUnitRegularization(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRegularization(
+                BuildingPersistentLocalId,
+                new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs
index 1fc85b392..bc33a90cc 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/CorrectBuildingUnitRetirementLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public CorrectBuildingUnitRetirementLambdaRequest(
         /// <returns>CorrectBuildingUnitRetirement.</returns>
         public CorrectBuildingUnitRetirement ToCommand()
         {
-            return new CorrectBuildingUnitRetirement(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new CorrectBuildingUnitRetirement(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs
index 6c28d5664..3bf8265b4 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DeregulateBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public DeregulateBuildingUnitLambdaRequest(
         /// <returns>DeregulateBuildingUnit.</returns>
         public DeregulateBuildingUnit ToCommand()
         {
-            return new DeregulateBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new DeregulateBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs
index c281bc47d..63b84ee5c 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/DetachAddressFromBuildingUnitLambdaRequest.cs
@@ -1,9 +1,8 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building.Validators;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building.Validators;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -38,7 +37,7 @@ public DetachAddressFromBuildingUnit ToCommand()
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
                 new AddressPersistentLocalId(addressPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs
index 5e2d8477f..de07b15e3 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/NotRealizeBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +30,7 @@ public NotRealizeBuildingUnit ToCommand()
             return new NotRealizeBuildingUnit(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs
index 69cb3dc5c..1ba250bc1 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/PlanBuildingUnitLambdaRequest.cs
@@ -1,10 +1,9 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.Building;
+    using Abstractions.BuildingUnit.Converters;
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.Building;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Converters;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
 
@@ -34,7 +33,7 @@ public PlanBuildingUnit ToCommand()
                 string.IsNullOrWhiteSpace(Request.Positie) ? null : Request.Positie.ToExtendedWkbGeometry(),
                 Request.Functie.Map(),
                 Request.AfwijkingVastgesteld,
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RealizeBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RealizeBuildingUnitLambdaRequest.cs
index a7b695b74..541e94b75 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RealizeBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RealizeBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public RealizeBuildingUnitLambdaRequest(
         /// <returns>RealizeBuildingUnit.</returns>
         public RealizeBuildingUnit ToCommand()
         {
-            return new RealizeBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new RealizeBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RegularizeBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RegularizeBuildingUnitLambdaRequest.cs
index 55f6f6f80..7dfa562a7 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RegularizeBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RegularizeBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +30,7 @@ public RegularizeBuildingUnit ToCommand()
             return new RegularizeBuildingUnit(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RemoveBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RemoveBuildingUnitLambdaRequest.cs
index 4338fec78..d5809cccc 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RemoveBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RemoveBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -32,7 +30,7 @@ public RemoveBuildingUnit ToCommand()
             return new RemoveBuildingUnit(
                 BuildingPersistentLocalId,
                 new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId),
-                CommandProvenance);
+                Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RetireBuildingUnitLambdaRequest.cs b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RetireBuildingUnitLambdaRequest.cs
index 0c2731413..9c511e052 100644
--- a/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RetireBuildingUnitLambdaRequest.cs
+++ b/src/BuildingRegistry.Api.BackOffice.Handlers.Lambda/Requests/BuildingUnit/RetireBuildingUnitLambdaRequest.cs
@@ -1,9 +1,7 @@
 namespace BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.BuildingUnit
 {
+    using Abstractions.BuildingUnit.Requests;
     using Abstractions.BuildingUnit.SqsRequests;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.Requests;
-    using BuildingRegistry.Api.BackOffice.Abstractions.BuildingUnit.SqsRequests;
     using BuildingRegistry.Building;
     using BuildingRegistry.Building.Commands;
     using IHasBuildingUnitPersistentLocalId = Abstractions.IHasBuildingUnitPersistentLocalId;
@@ -29,7 +27,7 @@ public RetireBuildingUnitLambdaRequest(
         /// <returns>RetireBuildingUnit.</returns>
         public RetireBuildingUnit ToCommand()
         {
-            return new RetireBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), CommandProvenance);
+            return new RetireBuildingUnit(BuildingPersistentLocalId, new BuildingUnitPersistentLocalId(BuildingUnitPersistentLocalId), Provenance);
         }
     }
 }
diff --git a/src/BuildingRegistry/Building/ProvenanceFactory.cs b/src/BuildingRegistry/Building/ProvenanceFactory.cs
index cbcbdea98..9e4ffebba 100644
--- a/src/BuildingRegistry/Building/ProvenanceFactory.cs
+++ b/src/BuildingRegistry/Building/ProvenanceFactory.cs
@@ -16,7 +16,13 @@ public Provenance CreateFrom(object provenanceHolder, TAggregateRoot aggregate)
                 throw new InvalidOperationException($"Cannot create provenance from {provenanceHolder.GetType().Name}");
             }
 
-            return provenance.Provenance;
+            return new Provenance(
+                SystemClock.Instance.GetCurrentInstant(),
+                provenance.Provenance.Application,
+                provenance.Provenance.Reason,
+                provenance.Provenance.Operator,
+                provenance.Provenance.Modification,
+                provenance.Provenance.Organisation);
         }
     }
 }
diff --git a/test/BuildingRegistry.Tests/AggregateTests/SnapshotTests/GivenBuilding.cs b/test/BuildingRegistry.Tests/AggregateTests/SnapshotTests/GivenBuilding.cs
index fbed9e13a..a9380b5e0 100644
--- a/test/BuildingRegistry.Tests/AggregateTests/SnapshotTests/GivenBuilding.cs
+++ b/test/BuildingRegistry.Tests/AggregateTests/SnapshotTests/GivenBuilding.cs
@@ -16,6 +16,7 @@ namespace BuildingRegistry.Tests.AggregateTests.SnapshotTests
     using FluentAssertions;
     using Legacy.Autofixture;
     using Newtonsoft.Json;
+    using NodaTime;
     using WhenPlanningBuildingUnit;
     using Xunit;
     using Xunit.Abstractions;
@@ -68,6 +69,15 @@ public async Task ThenSnapshotWasCreated()
                 hasDeviation: false);
             ((ISetProvenance)expectedEvent2).SetProvenance(provenance);
 
+            Assert(new Scenario()
+                .Given(_streamId,
+                    buildingWasPlanned,
+                    buildingUnitWasPlanned)
+                .When(planBuildingUnit)
+                .Then(
+                    new Fact(_streamId, expectedEvent),
+                    new Fact(_streamId, expectedEvent2)));
+
             var plannedBuildingUnit = new BuildingUnit(o => { });
             plannedBuildingUnit.Route(buildingUnitWasPlanned);
             var buildingUnit = new BuildingUnit(o => { });
@@ -89,26 +99,18 @@ public async Task ThenSnapshotWasCreated()
                     commonBuildingUnit
                 });
 
-            Assert(new Scenario()
-                .Given(_streamId,
-                    buildingWasPlanned,
-                    buildingUnitWasPlanned)
-                .When(planBuildingUnit)
-                .Then(
-                    new Fact(_streamId, expectedEvent),
-                    new Fact(_streamId, expectedEvent2)));
-
             var snapshotStore = (ISnapshotStore)Container.Resolve(typeof(ISnapshotStore));
             var latestSnapshot = await snapshotStore.FindLatestSnapshotAsync(_streamId, CancellationToken.None);
 
             latestSnapshot.Should().NotBeNull();
-            latestSnapshot
-                .Should()
-                .BeEquivalentTo(
-                    Build(
-                        expectedSnapshot,
-                        3,
-                        EventSerializerSettings));
+            var snapshot = JsonConvert.DeserializeObject<BuildingSnapshot>(latestSnapshot!.Data, EventSerializerSettings);
+
+            snapshot.Should().BeEquivalentTo(expectedSnapshot, options =>
+            {
+                options.Excluding(x => x.Path.EndsWith("LastEventHash"));
+                options.Excluding(x => x.Type == typeof(Instant));
+                return options;
+            });
         }
 
         private static SnapshotContainer Build(
diff --git a/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingMatchHeaderValidatorTests.cs b/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingMatchHeaderValidatorTests.cs
index 9202dea7f..58cb8c64a 100644
--- a/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingMatchHeaderValidatorTests.cs
+++ b/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingMatchHeaderValidatorTests.cs
@@ -1,11 +1,13 @@
 namespace BuildingRegistry.Tests.BackOffice.Infrastructure
 {
     using System;
+    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using Autofac;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.Api.ETag;
+    using Be.Vlaanderen.Basisregisters.EventHandling;
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
     using Building;
     using Building.Commands;
@@ -13,6 +15,9 @@ namespace BuildingRegistry.Tests.BackOffice.Infrastructure
     using BuildingRegistry.Api.BackOffice.Infrastructure;
     using Fixtures;
     using FluentAssertions;
+    using Newtonsoft.Json;
+    using SqlStreamStore;
+    using SqlStreamStore.Streams;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -39,10 +44,14 @@ public async Task WhenValidIfMatchHeader()
             var placeBuildingUnderConstruction = Fixture.Create<PlaceBuildingUnderConstruction>();
             DispatchArrangeCommand(placeBuildingUnderConstruction);
 
-            var lastEvent = new BuildingBecameUnderConstructionV2(buildingPersistentLocalId);
-            ((ISetProvenance)lastEvent).SetProvenance(placeBuildingUnderConstruction.Provenance);
+            var stream = await Container.Resolve<IStreamStore>()
+                .ReadStreamBackwards(new StreamId(new BuildingStreamId(buildingPersistentLocalId)), 1, 1);
 
-            var validEtag = new ETag(ETagType.Strong, lastEvent.GetHash());
+            var lastEvent = JsonConvert.DeserializeObject<BuildingBecameUnderConstructionV2>(
+                await stream.Messages.First().GetJsonData(),
+                EventSerializerSettings);
+
+            var validEtag = new ETag(ETagType.Strong, lastEvent!.GetHash());
             var sut = new IfMatchHeaderValidator(Container.Resolve<IBuildings>(), _backOfficeContext);
 
             // Act
@@ -70,7 +79,6 @@ public async Task WhenNotValidIfMatchHeader()
             result.Should().BeFalse();
         }
 
-
         [Theory]
         [InlineData("")]
         [InlineData(" ")]
diff --git a/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingUnitMatchHeaderValidatorTests.cs b/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingUnitMatchHeaderValidatorTests.cs
index 565dda141..c3566e538 100644
--- a/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingUnitMatchHeaderValidatorTests.cs
+++ b/test/BuildingRegistry.Tests/BackOffice/Infrastructure/IfBuildingUnitMatchHeaderValidatorTests.cs
@@ -1,13 +1,13 @@
 namespace BuildingRegistry.Tests.BackOffice.Infrastructure
 {
     using System;
+    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using AggregateTests.WhenPlanningBuildingUnit;
     using Autofac;
     using AutoFixture;
     using Be.Vlaanderen.Basisregisters.Api.ETag;
-    using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
     using Be.Vlaanderen.Basisregisters.Sqs.Exceptions;
     using Building;
     using Building.Commands;
@@ -16,6 +16,9 @@ namespace BuildingRegistry.Tests.BackOffice.Infrastructure
     using BuildingRegistry.Api.BackOffice.Infrastructure;
     using Fixtures;
     using FluentAssertions;
+    using Newtonsoft.Json;
+    using SqlStreamStore;
+    using SqlStreamStore.Streams;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -44,7 +47,6 @@ public async Task WhenValidIfMatchHeader()
             await _backOfficeContext.SaveChangesAsync();
 
             var planBuilding = Fixture.Create<PlanBuilding>();
-            var buildingGeometry = new BuildingGeometry(planBuilding.Geometry, BuildingGeometryMethod.Outlined);
             DispatchArrangeCommand(planBuilding);
 
             var planBuildingUnit = Fixture.Create<PlanBuildingUnit>()
@@ -52,16 +54,14 @@ public async Task WhenValidIfMatchHeader()
                 .WithPositionGeometryMethod(BuildingUnitPositionGeometryMethod.DerivedFromObject);
             DispatchArrangeCommand(planBuildingUnit);
 
-            var lastEvent = new BuildingUnitWasPlannedV2(
-                buildingPersistentLocalId,
-                buildingUnitPersistentLocalId,
-                planBuildingUnit.PositionGeometryMethod,
-                buildingGeometry.Center,
-                planBuildingUnit.Function,
-                planBuildingUnit.HasDeviation);
-            ((ISetProvenance)lastEvent).SetProvenance(planBuildingUnit.Provenance);
+            var stream = await Container.Resolve<IStreamStore>()
+                .ReadStreamBackwards(new StreamId(new BuildingStreamId(buildingPersistentLocalId)), 1, 1);
+
+            var lastEvent = JsonConvert.DeserializeObject<BuildingUnitWasPlannedV2>(
+                await stream.Messages.First().GetJsonData(),
+                EventSerializerSettings);
 
-            var validEtag = new ETag(ETagType.Strong, lastEvent.GetHash());
+            var validEtag = new ETag(ETagType.Strong, lastEvent!.GetHash());
             var sut = new IfMatchHeaderValidator(Container.Resolve<IBuildings>(), _backOfficeContext);
 
             // Act
diff --git a/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenRealizingAndMeasuringUnplannedBuilding.cs b/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenRealizingAndMeasuringUnplannedBuilding.cs
index d92b2bb0d..81652fcd1 100644
--- a/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenRealizingAndMeasuringUnplannedBuilding.cs
+++ b/test/BuildingRegistry.Tests/BackOffice/Lambda/Building/WhenRealizingAndMeasuringUnplannedBuilding.cs
@@ -7,7 +7,6 @@ namespace BuildingRegistry.Tests.BackOffice.Lambda.Building
     using System.Threading.Tasks;
     using Autofac;
     using AutoFixture;
-    using Be.Vlaanderen.Basisregisters.AggregateSource.Snapshotting;
     using Be.Vlaanderen.Basisregisters.CommandHandling;
     using Be.Vlaanderen.Basisregisters.CommandHandling.Idempotency;
     using Be.Vlaanderen.Basisregisters.GrAr.Provenance;
@@ -20,7 +19,6 @@ namespace BuildingRegistry.Tests.BackOffice.Lambda.Building
     using BuildingRegistry.Api.BackOffice.Handlers.Lambda.Handlers.Building;
     using BuildingRegistry.Api.BackOffice.Handlers.Lambda.Requests.Building;
     using BuildingRegistry.Building;
-    using BuildingRegistry.Building.Events;
     using Fixtures;
     using FluentAssertions;
     using Microsoft.Extensions.Configuration;
@@ -148,7 +146,6 @@ public async Task GivenRetryingRequest_ThenBuildingIsRealizedAndMeasured()
             var buildingPersistentLocalId = Fixture.Create<BuildingPersistentLocalId>();
 
             var buildings = Container.Resolve<IBuildings>();
-            var eTagResponse = new ETagResponse(string.Empty, Fixture.Create<string>());
             var handler = new RealizeAndMeasureUnplannedBuildingLambdaHandler(
                 Container.Resolve<IConfiguration>(),
                 new FakeRetryPolicy(),
@@ -158,7 +155,7 @@ public async Task GivenRetryingRequest_ThenBuildingIsRealizedAndMeasured()
 
             var request = new RealizeAndMeasureUnplannedBuildingLambdaRequest(
                 buildingPersistentLocalId,
-                new RealizeAndMeasureUnplannedBuildingSqsRequest()
+                new RealizeAndMeasureUnplannedBuildingSqsRequest
                 {
                     BuildingPersistentLocalId = buildingPersistentLocalId,
                     IfMatchHeaderValue = null,
@@ -177,6 +174,7 @@ public async Task GivenRetryingRequest_ThenBuildingIsRealizedAndMeasured()
 
             //Act
             await handler.Handle(request, CancellationToken.None);
+            await Task.Delay(TimeSpan.FromMilliseconds(200)); // Verify Idempotency timestamp.
             await handler.Handle(request, CancellationToken.None);
 
             var building =