diff --git a/Dockerfile b/Dockerfile
index 5ed521ac..7b0c3832 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG RUNNER_IMG=
+ARG RUNNER_IMG
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 ARG TARGETARCH
 
 WORKDIR /app
@@ -23,7 +23,7 @@ ARG TARGETARCH
 COPY ./src ./src
 RUN dotnet publish ./src/es-replicator -c Release -a $TARGETARCH -clp:NoSummary --no-self-contained -o /app/publish
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS runner
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runner
 
 WORKDIR /app
 COPY --from=publish /app/publish .
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ea81fccd..1573dff4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>11</LangVersion>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <NoWarn>$(NoWarn);CS1591;CS0618;</NoWarn>
diff --git a/src/EventStore.Replicator.Esdb.Grpc/EventStore.Replicator.Esdb.Grpc.csproj b/src/EventStore.Replicator.Esdb.Grpc/EventStore.Replicator.Esdb.Grpc.csproj
index 6eec68ff..98efffe4 100644
--- a/src/EventStore.Replicator.Esdb.Grpc/EventStore.Replicator.Esdb.Grpc.csproj
+++ b/src/EventStore.Replicator.Esdb.Grpc/EventStore.Replicator.Esdb.Grpc.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.0.0" />
+        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
         <Using Include="EventStore.Client" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />
diff --git a/src/EventStore.Replicator.Esdb.Tcp/EventStore.Replicator.Esdb.Tcp.csproj b/src/EventStore.Replicator.Esdb.Tcp/EventStore.Replicator.Esdb.Tcp.csproj
index 9308927e..3d6acb3a 100644
--- a/src/EventStore.Replicator.Esdb.Tcp/EventStore.Replicator.Esdb.Tcp.csproj
+++ b/src/EventStore.Replicator.Esdb.Tcp/EventStore.Replicator.Esdb.Tcp.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
         <PackageReference Include="EventStore.Client" Version="22.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
         <Using Include="EventStore.ClientAPI" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/EventStore.Replicator.Http/EventStore.Replicator.Http.csproj b/src/EventStore.Replicator.Http/EventStore.Replicator.Http.csproj
index 2f4a5df2..3538fe72 100644
--- a/src/EventStore.Replicator.Http/EventStore.Replicator.Http.csproj
+++ b/src/EventStore.Replicator.Http/EventStore.Replicator.Http.csproj
@@ -2,4 +2,7 @@
     <ItemGroup>
       <ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
+    </ItemGroup>
 </Project>
diff --git a/src/EventStore.Replicator.JavaScript/EventStore.Replicator.JavaScript.csproj b/src/EventStore.Replicator.JavaScript/EventStore.Replicator.JavaScript.csproj
index a44c3a82..a60bcbf9 100644
--- a/src/EventStore.Replicator.JavaScript/EventStore.Replicator.JavaScript.csproj
+++ b/src/EventStore.Replicator.JavaScript/EventStore.Replicator.JavaScript.csproj
@@ -4,5 +4,6 @@
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Jint" Version="3.0.0-beta-2049" />
+      <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 </Project>
diff --git a/src/EventStore.Replicator.Kafka/EventStore.Replicator.Kafka.csproj b/src/EventStore.Replicator.Kafka/EventStore.Replicator.Kafka.csproj
index 919b95ec..7830043a 100644
--- a/src/EventStore.Replicator.Kafka/EventStore.Replicator.Kafka.csproj
+++ b/src/EventStore.Replicator.Kafka/EventStore.Replicator.Kafka.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="Confluent.Kafka" Version="2.1.0" />
+        <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
         <Using Include="Confluent.Kafka" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/EventStore.Replicator.Kafka/KafkaJsMessageRouter.cs b/src/EventStore.Replicator.Kafka/KafkaJsMessageRouter.cs
index 75d4471b..b1c1304c 100644
--- a/src/EventStore.Replicator.Kafka/KafkaJsMessageRouter.cs
+++ b/src/EventStore.Replicator.Kafka/KafkaJsMessageRouter.cs
@@ -3,6 +3,7 @@
 using Jint;
 using Jint.Native;
 using Jint.Native.Json;
+// ReSharper disable NotAccessedPositionalProperty.Global
 
 namespace EventStore.Replicator.Kafka; 
 
@@ -16,7 +17,7 @@ public KafkaJsMessageRouter(string routingFunction) {
             AsRoute
         );
 
-        static MessageRoute AsRoute(JsValue result, RouteEvent evt) {
+        static MessageRoute AsRoute(JsValue? result, RouteEvent evt) {
             if (result == null || result.IsUndefined() || !result.IsObject())
                 return DefaultRouters.RouteByCategory(evt.Stream);
 
@@ -36,7 +37,7 @@ public MessageRoute Route(ProposedEvent evt) {
                 evt.EventDetails.Stream,
                 evt.EventDetails.EventType,
                 parser.Parse(evt.Data.AsUtf8String()),
-                parser.Parse(evt.Metadata?.AsUtf8String())
+                evt.Metadata == null ? null : parser.Parse(evt.Metadata.AsUtf8String())
             )
         );
     }
diff --git a/src/EventStore.Replicator.Mongo/EventStore.Replicator.Mongo.csproj b/src/EventStore.Replicator.Mongo/EventStore.Replicator.Mongo.csproj
index 830bd9f4..9f9284ed 100644
--- a/src/EventStore.Replicator.Mongo/EventStore.Replicator.Mongo.csproj
+++ b/src/EventStore.Replicator.Mongo/EventStore.Replicator.Mongo.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+        <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />
diff --git a/src/EventStore.Replicator.Shared/EventStore.Replicator.Shared.csproj b/src/EventStore.Replicator.Shared/EventStore.Replicator.Shared.csproj
index 16994364..a8d27bfc 100644
--- a/src/EventStore.Replicator.Shared/EventStore.Replicator.Shared.csproj
+++ b/src/EventStore.Replicator.Shared/EventStore.Replicator.Shared.csproj
@@ -6,6 +6,7 @@
     <ItemGroup>
         <PackageReference Include="LibLog" Version="5.0.8" PrivateAssets="All" />
         <PackageReference Include="Ubiquitous.Metrics" Version="0.4.0" />
-        <PackageReference Include="YamlDotNet" Version="13.1.0" />
+        <PackageReference Include="YamlDotNet" Version="15.1.1" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 </Project>
diff --git a/src/EventStore.Replicator/EventStore.Replicator.csproj b/src/EventStore.Replicator/EventStore.Replicator.csproj
index ee8c4b60..d776f8cb 100644
--- a/src/EventStore.Replicator/EventStore.Replicator.csproj
+++ b/src/EventStore.Replicator/EventStore.Replicator.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
         <PackageReference Include="GreenPipes" Version="4.0.1" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/es-replicator/es-replicator.csproj b/src/es-replicator/es-replicator.csproj
index d246afbd..1434d315 100644
--- a/src/es-replicator/es-replicator.csproj
+++ b/src/es-replicator/es-replicator.csproj
@@ -7,13 +7,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="2.12.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
-        <PackageReference Include="prometheus-net.AspNetCore" Version="8.0.0" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+        <PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
         <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.1" />
         <PackageReference Include="Ubiquitous.Metrics.Prometheus" Version="0.4.0" />
+        <PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/EventStore.Replicator.Tests/EventStore.Replicator.Tests.csproj b/test/EventStore.Replicator.Tests/EventStore.Replicator.Tests.csproj
index 1b76710e..90b3d5af 100644
--- a/test/EventStore.Replicator.Tests/EventStore.Replicator.Tests.csproj
+++ b/test/EventStore.Replicator.Tests/EventStore.Replicator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>11</LangVersion>
         <IsPackable>false</IsPackable>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -10,14 +10,14 @@
     <ItemGroup>
         <PackageReference Include="DockerComposeFixture" Version="1.1.0" />
         <PackageReference Include="EventStore.Client" Version="22.0.0" />
-        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.0.0" />
-        <PackageReference Include="FluentAssertions" Version="6.11.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-        <PackageReference Include="Serilog" Version="2.12.0" />
+        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
         <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
-        <PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
+        <PackageReference Include="xunit" Version="2.6.6" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="All" />
+        <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>