diff --git a/Source/EventFlow.MongoDB.Tests/EventFlow.MongoDB.Tests.csproj b/Source/EventFlow.MongoDB.Tests/EventFlow.MongoDB.Tests.csproj
index 775436c3d..d55130097 100644
--- a/Source/EventFlow.MongoDB.Tests/EventFlow.MongoDB.Tests.csproj
+++ b/Source/EventFlow.MongoDB.Tests/EventFlow.MongoDB.Tests.csproj
@@ -6,14 +6,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
-    <PackageReference Include="Mongo2Go" Version="3.1.3" />
+    <PackageReference Include="Mongo2Go" Version="4.1.0" />
+    <PackageReference Include="MongoDB.Driver" Version="3.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\EventFlow.MongoDB\EventFlow.MongoDB.csproj" />
-	<ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
+    <ProjectReference Include="..\EventFlow.TestHelpers\EventFlow.TestHelpers.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj b/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj
index e1450e41d..8d9b0b49a 100644
--- a/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj
+++ b/Source/EventFlow.MongoDB/EventFlow.MongoDB.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
+    <PackageReference Include="MongoDB.Driver" Version="[3.0.0,4.0)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/EventFlow.MongoDB/ValueObjects/MongoDbEventDataModel.cs b/Source/EventFlow.MongoDB/ValueObjects/MongoDbEventDataModel.cs
index 575ed28e7..4eb4e4aab 100644
--- a/Source/EventFlow.MongoDB/ValueObjects/MongoDbEventDataModel.cs
+++ b/Source/EventFlow.MongoDB/ValueObjects/MongoDbEventDataModel.cs
@@ -23,6 +23,7 @@
 using System;
 using EventFlow.EventStores;
 using EventFlow.ValueObjects;
+using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using Newtonsoft.Json;
 
@@ -34,6 +35,7 @@ public class MongoDbEventDataModel : ValueObject, ICommittedDomainEvent
         public long _id { get; set; }
 
         [JsonProperty("batchId")]
+        [BsonGuidRepresentation(GuidRepresentation.Standard)]
         public Guid BatchId { get; set; }
 
         long? _version { get; set; }