diff --git a/Nexus.Application/Nexus.Application.csproj b/Nexus.Application/Nexus.Application.csproj
index 4106ccf..849eba6 100644
--- a/Nexus.Application/Nexus.Application.csproj
+++ b/Nexus.Application/Nexus.Application.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Marten" Version="8.37.4" />
+      <PackageReference Include="Marten" Version="9.22.2" />
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
       <PackageReference Include="WolverineFx.Http" Version="5.40.0" />
       <ProjectReference Include="..\Nexus.Domain\Nexus.Domain.csproj" />
diff --git a/Nexus.Application/packages.lock.json b/Nexus.Application/packages.lock.json
index 357a6de..ebf2f44 100644
--- a/Nexus.Application/packages.lock.json
+++ b/Nexus.Application/packages.lock.json
@@ -10,18 +10,16 @@
       },
       "Marten": {
         "type": "Direct",
-        "requested": "[8.37.4, )",
-        "resolved": "8.37.4",
-        "contentHash": "5X8F3jI4VeW8A9QwkOL4EWLJZAE6ikrkMDkxwdhq0A/bVw6G4qLo7oWy1VnogyuH3J6LYrpdAjm1H4bYIQ5piw==",
+        "requested": "[9.22.2, )",
+        "resolved": "9.22.2",
+        "contentHash": "NLcVXxyGmyt97PgpIZ0IYNZGBgpAZ/PC2Uhrmm9L82l09mrukeRruqlqJuri5Xt0ZItmpXwPSmmALi/aQGGajA==",
         "dependencies": {
-          "JasperFx": "1.31.0",
-          "JasperFx.Events": "1.36.2",
-          "JasperFx.RuntimeCompiler": "4.5.0",
+          "JasperFx": "2.37.0",
+          "JasperFx.Events": "2.37.0",
           "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
           "Microsoft.IO.RecyclableMemoryStream": "3.0.1",
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql.Json.NET": "9.0.4",
-          "Weasel.Postgresql": "8.15.0"
+          "Weasel.Postgresql": "9.23.0",
+          "Weasel.Storage": "9.23.0"
         }
       },
       "Microsoft.Extensions.Hosting": {
@@ -147,8 +145,8 @@
       },
       "FastExpressionCompiler": {
         "type": "Transitive",
-        "resolved": "5.3.0",
-        "contentHash": "XRmGW48Gdm7B70WUtTJJUnmuc8jRDmOhhjG/a3rix/nXChnrkETaSvA0j2VrcsH4MNeYLe60LA5o5JABmbneag=="
+        "resolved": "5.4.1",
+        "contentHash": "nqMykMspK5cQd35Y8ulQzAujxCcCwZVUne32pC5xNpXqrbPCuKOPMWkKHJ3LveAZPm6dsVvump0TJ1SZ9RzfTQ=="
       },
       "Humanizer.Core": {
         "type": "Transitive",
@@ -162,10 +160,10 @@
       },
       "JasperFx": {
         "type": "Transitive",
-        "resolved": "1.31.0",
-        "contentHash": "4ixFajJnNJf9Unuc49rq8pKtHYMdUVepE1tX921F48u6BAbf9BNuGdijDioehYLGl/yhsF2yjRrQXpsN9FMZIg==",
+        "resolved": "2.37.0",
+        "contentHash": "ruclAZLxWdm5njtCp9l4EVTsYPOzQu50iaCRfC/pl/ZhF7jfBGH1J7lZYC8EiAW2UYoDFd//B+Xh8wUrEaLtoA==",
         "dependencies": {
-          "FastExpressionCompiler": "5.3.0",
+          "FastExpressionCompiler": "5.4.1",
           "ImTools": "4.0.0",
           "Microsoft.Bcl.TimeProvider": "10.0.0",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
@@ -178,10 +176,10 @@
       },
       "JasperFx.Events": {
         "type": "Transitive",
-        "resolved": "1.36.2",
-        "contentHash": "VV1xYQOrLjO5vx2OFLlUyph7ZlKTYrg8tCGKmXUEEMz1N+NlhtvkGzXPpLtYgk23fqxAMGuiASrYoq87Wsi8qw==",
+        "resolved": "2.37.0",
+        "contentHash": "DHThtg0wDQ+qmnUp4INm/uZPL6b2ONp1Vd1+KuGiZDTyfJ1kTtNsHgnNqqh5bkmLbNMej6c1HD/P+LBPloB7Ug==",
         "dependencies": {
-          "JasperFx": "1.31.0"
+          "JasperFx": "2.37.0"
         }
       },
       "JasperFx.RuntimeCompiler": {
@@ -645,15 +643,6 @@
           "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
         }
       },
-      "Npgsql.Json.NET": {
-        "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "Eunq7mqatJujFOaZMdiWT9N7eUXHEFxe4IX/PeN8Nt1BpNYjzF2tPlmqR90EvuGT3tiEicmj4xDviC0UcPwM1w==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql": "9.0.4"
-        }
-      },
       "Npgsql.NetTopologySuite": {
         "type": "Transitive",
         "resolved": "9.0.4",
@@ -750,21 +739,31 @@
       },
       "Weasel.Core": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "+X2GRJCVeC6VjA+REbtb9ULtAvVG4DT8Py0tffIRTPsA9IdY89fLu09MFkcnywgTzQK3JB4hKC7t8d9xwdp6jg==",
+        "resolved": "9.23.0",
+        "contentHash": "QbAiU2kR8DcghHqQME/o3I97rmwvqbFks8PQg2ckRoyICIsqTfKoDmglNgGeZdA7cekgzCBa2tTlk4B23080MA==",
         "dependencies": {
-          "JasperFx": "1.26.0"
+          "JasperFx": "2.37.0"
         }
       },
       "Weasel.Postgresql": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "YD/3CWlqCCX5dBVMZmIYvR8/flwcgDHPQq4EtUHJOlFnPrmQX4Lfd5rmFCIW3n/3F53qxMXl2HaJnxGI1Twtsw==",
+        "resolved": "9.23.0",
+        "contentHash": "rJH8xM0vI+Zbe0m3PObYzFf/CYdhqy+iYaiY5fiQtvsqjPKUl60IK+O6YlroMyywHxOuSgXvkGI/d4ge0mzfyw==",
         "dependencies": {
           "DistributedLock.Postgres": "1.3.0",
+          "JasperFx.Events": "2.37.0",
           "Npgsql": "9.0.4",
           "Npgsql.NetTopologySuite": "9.0.4",
-          "Weasel.Core": "8.15.1"
+          "Weasel.Core": "9.23.0"
+        }
+      },
+      "Weasel.Storage": {
+        "type": "Transitive",
+        "resolved": "9.23.0",
+        "contentHash": "mNgU/X5c+zfu7oZB3pOcyPn3kCsnSrmByuLaKyOqQW8y5jpAvAL2bSiB3UXlyMEKAh1TKqUNV5glGcBi7cNyfw==",
+        "dependencies": {
+          "JasperFx.Events": "2.37.0",
+          "Weasel.Core": "9.23.0"
         }
       },
       "WolverineFx": {
diff --git a/Nexus.Infrastructure/Nexus.Infrastructure.csproj b/Nexus.Infrastructure/Nexus.Infrastructure.csproj
index e11b036..76b4018 100644
--- a/Nexus.Infrastructure/Nexus.Infrastructure.csproj
+++ b/Nexus.Infrastructure/Nexus.Infrastructure.csproj
@@ -11,7 +11,7 @@
         <PackageReference Include="LocalStack.Client.Extensions" Version="2.0.1" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Marten" Version="8.37.4" />
+      <PackageReference Include="Marten" Version="9.22.2" />
       <PackageReference Include="WolverineFx.Http" Version="5.40.0" />
       <PackageReference Include="WolverineFx.Http.Marten" Version="5.40.0" />
     <PackageReference Include="WolverineFx.RabbitMQ" Version="5.40.0" />
diff --git a/Nexus.Infrastructure/packages.lock.json b/Nexus.Infrastructure/packages.lock.json
index cce40e7..5af69fb 100644
--- a/Nexus.Infrastructure/packages.lock.json
+++ b/Nexus.Infrastructure/packages.lock.json
@@ -49,18 +49,16 @@
       },
       "Marten": {
         "type": "Direct",
-        "requested": "[8.37.4, )",
-        "resolved": "8.37.4",
-        "contentHash": "5X8F3jI4VeW8A9QwkOL4EWLJZAE6ikrkMDkxwdhq0A/bVw6G4qLo7oWy1VnogyuH3J6LYrpdAjm1H4bYIQ5piw==",
+        "requested": "[9.22.2, )",
+        "resolved": "9.22.2",
+        "contentHash": "NLcVXxyGmyt97PgpIZ0IYNZGBgpAZ/PC2Uhrmm9L82l09mrukeRruqlqJuri5Xt0ZItmpXwPSmmALi/aQGGajA==",
         "dependencies": {
-          "JasperFx": "1.31.0",
-          "JasperFx.Events": "1.36.2",
-          "JasperFx.RuntimeCompiler": "4.5.0",
+          "JasperFx": "2.37.0",
+          "JasperFx.Events": "2.37.0",
           "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
           "Microsoft.IO.RecyclableMemoryStream": "3.0.1",
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql.Json.NET": "9.0.4",
-          "Weasel.Postgresql": "8.15.0"
+          "Weasel.Postgresql": "9.23.0",
+          "Weasel.Storage": "9.23.0"
         }
       },
       "WolverineFx.Http": {
@@ -123,8 +121,8 @@
       },
       "FastExpressionCompiler": {
         "type": "Transitive",
-        "resolved": "5.3.0",
-        "contentHash": "XRmGW48Gdm7B70WUtTJJUnmuc8jRDmOhhjG/a3rix/nXChnrkETaSvA0j2VrcsH4MNeYLe60LA5o5JABmbneag=="
+        "resolved": "5.4.1",
+        "contentHash": "nqMykMspK5cQd35Y8ulQzAujxCcCwZVUne32pC5xNpXqrbPCuKOPMWkKHJ3LveAZPm6dsVvump0TJ1SZ9RzfTQ=="
       },
       "FluentValidation": {
         "type": "Transitive",
@@ -143,10 +141,10 @@
       },
       "JasperFx": {
         "type": "Transitive",
-        "resolved": "1.31.0",
-        "contentHash": "4ixFajJnNJf9Unuc49rq8pKtHYMdUVepE1tX921F48u6BAbf9BNuGdijDioehYLGl/yhsF2yjRrQXpsN9FMZIg==",
+        "resolved": "2.37.0",
+        "contentHash": "ruclAZLxWdm5njtCp9l4EVTsYPOzQu50iaCRfC/pl/ZhF7jfBGH1J7lZYC8EiAW2UYoDFd//B+Xh8wUrEaLtoA==",
         "dependencies": {
-          "FastExpressionCompiler": "5.3.0",
+          "FastExpressionCompiler": "5.4.1",
           "ImTools": "4.0.0",
           "Microsoft.Bcl.TimeProvider": "10.0.0",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
@@ -159,10 +157,10 @@
       },
       "JasperFx.Events": {
         "type": "Transitive",
-        "resolved": "1.36.2",
-        "contentHash": "VV1xYQOrLjO5vx2OFLlUyph7ZlKTYrg8tCGKmXUEEMz1N+NlhtvkGzXPpLtYgk23fqxAMGuiASrYoq87Wsi8qw==",
+        "resolved": "2.37.0",
+        "contentHash": "DHThtg0wDQ+qmnUp4INm/uZPL6b2ONp1Vd1+KuGiZDTyfJ1kTtNsHgnNqqh5bkmLbNMej6c1HD/P+LBPloB7Ug==",
         "dependencies": {
-          "JasperFx": "1.31.0"
+          "JasperFx": "2.37.0"
         }
       },
       "JasperFx.RuntimeCompiler": {
@@ -655,15 +653,6 @@
           "Microsoft.Extensions.Logging.Abstractions": "8.0.2"
         }
       },
-      "Npgsql.Json.NET": {
-        "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "Eunq7mqatJujFOaZMdiWT9N7eUXHEFxe4IX/PeN8Nt1BpNYjzF2tPlmqR90EvuGT3tiEicmj4xDviC0UcPwM1w==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql": "9.0.4"
-        }
-      },
       "Npgsql.NetTopologySuite": {
         "type": "Transitive",
         "resolved": "9.0.4",
@@ -784,21 +773,31 @@
       },
       "Weasel.Core": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "+X2GRJCVeC6VjA+REbtb9ULtAvVG4DT8Py0tffIRTPsA9IdY89fLu09MFkcnywgTzQK3JB4hKC7t8d9xwdp6jg==",
+        "resolved": "9.23.0",
+        "contentHash": "QbAiU2kR8DcghHqQME/o3I97rmwvqbFks8PQg2ckRoyICIsqTfKoDmglNgGeZdA7cekgzCBa2tTlk4B23080MA==",
         "dependencies": {
-          "JasperFx": "1.26.0"
+          "JasperFx": "2.37.0"
         }
       },
       "Weasel.Postgresql": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "YD/3CWlqCCX5dBVMZmIYvR8/flwcgDHPQq4EtUHJOlFnPrmQX4Lfd5rmFCIW3n/3F53qxMXl2HaJnxGI1Twtsw==",
+        "resolved": "9.23.0",
+        "contentHash": "rJH8xM0vI+Zbe0m3PObYzFf/CYdhqy+iYaiY5fiQtvsqjPKUl60IK+O6YlroMyywHxOuSgXvkGI/d4ge0mzfyw==",
         "dependencies": {
           "DistributedLock.Postgres": "1.3.0",
+          "JasperFx.Events": "2.37.0",
           "Npgsql": "9.0.4",
           "Npgsql.NetTopologySuite": "9.0.4",
-          "Weasel.Core": "8.15.1"
+          "Weasel.Core": "9.23.0"
+        }
+      },
+      "Weasel.Storage": {
+        "type": "Transitive",
+        "resolved": "9.23.0",
+        "contentHash": "mNgU/X5c+zfu7oZB3pOcyPn3kCsnSrmByuLaKyOqQW8y5jpAvAL2bSiB3UXlyMEKAh1TKqUNV5glGcBi7cNyfw==",
+        "dependencies": {
+          "JasperFx.Events": "2.37.0",
+          "Weasel.Core": "9.23.0"
         }
       },
       "WolverineFx": {
@@ -854,7 +853,7 @@
         "type": "Project",
         "dependencies": {
           "FluentValidation": "[12.1.1, )",
-          "Marten": "[8.37.4, )",
+          "Marten": "[9.22.2, )",
           "Microsoft.Extensions.Hosting": "[10.0.10, )",
           "Nexus.Domain": "[1.0.0, )",
           "SkiaSharp": "[3.119.4, )",
diff --git a/Nexus.Migrations.IntegrationTests/Nexus.Migrations.IntegrationTests.csproj b/Nexus.Migrations.IntegrationTests/Nexus.Migrations.IntegrationTests.csproj
index dc33d43..ed2eb41 100644
--- a/Nexus.Migrations.IntegrationTests/Nexus.Migrations.IntegrationTests.csproj
+++ b/Nexus.Migrations.IntegrationTests/Nexus.Migrations.IntegrationTests.csproj
@@ -24,7 +24,7 @@
 
     <ItemGroup>
         <PackageReference Include="grate.postgresql" Version="2.1.6" />
-        <PackageReference Include="Marten" Version="8.37.4" />
+        <PackageReference Include="Marten" Version="9.22.2" />
         <PackageReference Include="MartinCostello.Logging.XUnit.v3" Version="0.7.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1"/>
         <PackageReference Include="Npgsql.DependencyInjection" Version="10.0.3" />
diff --git a/Nexus.Migrations.IntegrationTests/packages.lock.json b/Nexus.Migrations.IntegrationTests/packages.lock.json
index 3786279..bc21168 100644
--- a/Nexus.Migrations.IntegrationTests/packages.lock.json
+++ b/Nexus.Migrations.IntegrationTests/packages.lock.json
@@ -18,18 +18,16 @@
       },
       "Marten": {
         "type": "Direct",
-        "requested": "[8.37.4, )",
-        "resolved": "8.37.4",
-        "contentHash": "5X8F3jI4VeW8A9QwkOL4EWLJZAE6ikrkMDkxwdhq0A/bVw6G4qLo7oWy1VnogyuH3J6LYrpdAjm1H4bYIQ5piw==",
+        "requested": "[9.22.2, )",
+        "resolved": "9.22.2",
+        "contentHash": "NLcVXxyGmyt97PgpIZ0IYNZGBgpAZ/PC2Uhrmm9L82l09mrukeRruqlqJuri5Xt0ZItmpXwPSmmALi/aQGGajA==",
         "dependencies": {
-          "JasperFx": "1.31.0",
-          "JasperFx.Events": "1.36.2",
-          "JasperFx.RuntimeCompiler": "4.5.0",
+          "JasperFx": "2.37.0",
+          "JasperFx.Events": "2.37.0",
           "Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
           "Microsoft.IO.RecyclableMemoryStream": "3.0.1",
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql.Json.NET": "9.0.4",
-          "Weasel.Postgresql": "8.15.0"
+          "Weasel.Postgresql": "9.23.0",
+          "Weasel.Storage": "9.23.0"
         }
       },
       "MartinCostello.Logging.XUnit.v3": {
@@ -168,8 +166,8 @@
       },
       "FastExpressionCompiler": {
         "type": "Transitive",
-        "resolved": "5.3.0",
-        "contentHash": "XRmGW48Gdm7B70WUtTJJUnmuc8jRDmOhhjG/a3rix/nXChnrkETaSvA0j2VrcsH4MNeYLe60LA5o5JABmbneag=="
+        "resolved": "5.4.1",
+        "contentHash": "nqMykMspK5cQd35Y8ulQzAujxCcCwZVUne32pC5xNpXqrbPCuKOPMWkKHJ3LveAZPm6dsVvump0TJ1SZ9RzfTQ=="
       },
       "FluentValidation": {
         "type": "Transitive",
@@ -199,10 +197,10 @@
       },
       "JasperFx": {
         "type": "Transitive",
-        "resolved": "1.31.0",
-        "contentHash": "4ixFajJnNJf9Unuc49rq8pKtHYMdUVepE1tX921F48u6BAbf9BNuGdijDioehYLGl/yhsF2yjRrQXpsN9FMZIg==",
+        "resolved": "2.37.0",
+        "contentHash": "ruclAZLxWdm5njtCp9l4EVTsYPOzQu50iaCRfC/pl/ZhF7jfBGH1J7lZYC8EiAW2UYoDFd//B+Xh8wUrEaLtoA==",
         "dependencies": {
-          "FastExpressionCompiler": "5.3.0",
+          "FastExpressionCompiler": "5.4.1",
           "ImTools": "4.0.0",
           "Microsoft.Bcl.TimeProvider": "10.0.0",
           "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
@@ -215,10 +213,10 @@
       },
       "JasperFx.Events": {
         "type": "Transitive",
-        "resolved": "1.36.2",
-        "contentHash": "VV1xYQOrLjO5vx2OFLlUyph7ZlKTYrg8tCGKmXUEEMz1N+NlhtvkGzXPpLtYgk23fqxAMGuiASrYoq87Wsi8qw==",
+        "resolved": "2.37.0",
+        "contentHash": "DHThtg0wDQ+qmnUp4INm/uZPL6b2ONp1Vd1+KuGiZDTyfJ1kTtNsHgnNqqh5bkmLbNMej6c1HD/P+LBPloB7Ug==",
         "dependencies": {
-          "JasperFx": "1.31.0"
+          "JasperFx": "2.37.0"
         }
       },
       "JasperFx.RuntimeCompiler": {
@@ -769,15 +767,6 @@
           "Microsoft.Extensions.Logging.Abstractions": "10.0.0"
         }
       },
-      "Npgsql.Json.NET": {
-        "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "Eunq7mqatJujFOaZMdiWT9N7eUXHEFxe4IX/PeN8Nt1BpNYjzF2tPlmqR90EvuGT3tiEicmj4xDviC0UcPwM1w==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "Npgsql": "9.0.4"
-        }
-      },
       "Npgsql.NetTopologySuite": {
         "type": "Transitive",
         "resolved": "9.0.4",
@@ -932,21 +921,31 @@
       },
       "Weasel.Core": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "+X2GRJCVeC6VjA+REbtb9ULtAvVG4DT8Py0tffIRTPsA9IdY89fLu09MFkcnywgTzQK3JB4hKC7t8d9xwdp6jg==",
+        "resolved": "9.23.0",
+        "contentHash": "QbAiU2kR8DcghHqQME/o3I97rmwvqbFks8PQg2ckRoyICIsqTfKoDmglNgGeZdA7cekgzCBa2tTlk4B23080MA==",
         "dependencies": {
-          "JasperFx": "1.26.0"
+          "JasperFx": "2.37.0"
         }
       },
       "Weasel.Postgresql": {
         "type": "Transitive",
-        "resolved": "8.15.1",
-        "contentHash": "YD/3CWlqCCX5dBVMZmIYvR8/flwcgDHPQq4EtUHJOlFnPrmQX4Lfd5rmFCIW3n/3F53qxMXl2HaJnxGI1Twtsw==",
+        "resolved": "9.23.0",
+        "contentHash": "rJH8xM0vI+Zbe0m3PObYzFf/CYdhqy+iYaiY5fiQtvsqjPKUl60IK+O6YlroMyywHxOuSgXvkGI/d4ge0mzfyw==",
         "dependencies": {
           "DistributedLock.Postgres": "1.3.0",
+          "JasperFx.Events": "2.37.0",
           "Npgsql": "9.0.4",
           "Npgsql.NetTopologySuite": "9.0.4",
-          "Weasel.Core": "8.15.1"
+          "Weasel.Core": "9.23.0"
+        }
+      },
+      "Weasel.Storage": {
+        "type": "Transitive",
+        "resolved": "9.23.0",
+        "contentHash": "mNgU/X5c+zfu7oZB3pOcyPn3kCsnSrmByuLaKyOqQW8y5jpAvAL2bSiB3UXlyMEKAh1TKqUNV5glGcBi7cNyfw==",
+        "dependencies": {
+          "JasperFx.Events": "2.37.0",
+          "Weasel.Core": "9.23.0"
         }
       },
       "WolverineFx": {
@@ -1087,7 +1086,7 @@
         "type": "Project",
         "dependencies": {
           "FluentValidation": "[12.1.1, )",
-          "Marten": "[8.37.4, )",
+          "Marten": "[9.22.2, )",
           "Microsoft.Extensions.Hosting": "[10.0.10, )",
           "Nexus.Domain": "[1.0.0, )",
           "SkiaSharp": "[3.119.4, )",