diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index 3065f12..57ee33a 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -20,7 +20,7 @@ jobs:
       id: tag
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - run: echo "::remove-matcher owner=csc::"
     - uses: reviewdog/action-setup@v1
     - run: dotnet --info
diff --git a/src/Samhammer.Mongo.Abstractions/Samhammer.Mongo.Abstractions.csproj b/src/Samhammer.Mongo.Abstractions/Samhammer.Mongo.Abstractions.csproj
index 9306525..3785d80 100644
--- a/src/Samhammer.Mongo.Abstractions/Samhammer.Mongo.Abstractions.csproj
+++ b/src/Samhammer.Mongo.Abstractions/Samhammer.Mongo.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="2.24.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
+    <PackageReference Include="MongoDB.Bson" Version="3.5.2" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Samhammer.Mongo.Connector/Samhammer.Mongo.Connector.csproj b/src/Samhammer.Mongo.Connector/Samhammer.Mongo.Connector.csproj
index b94babc..ad7d1d5 100644
--- a/src/Samhammer.Mongo.Connector/Samhammer.Mongo.Connector.csproj
+++ b/src/Samhammer.Mongo.Connector/Samhammer.Mongo.Connector.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samhammer.Mongo.Test/Samhammer.Mongo.Test.csproj b/src/Samhammer.Mongo.Test/Samhammer.Mongo.Test.csproj
index e8cd98a..6433f3b 100644
--- a/src/Samhammer.Mongo.Test/Samhammer.Mongo.Test.csproj
+++ b/src/Samhammer.Mongo.Test/Samhammer.Mongo.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -11,23 +11,23 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+    <PackageReference Include="FluentAssertions" Version="7.2.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.5.61" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samhammer.Mongo/BaseRepositoryMongo.cs b/src/Samhammer.Mongo/BaseRepositoryMongo.cs
index 49ea919..f20ec33 100644
--- a/src/Samhammer.Mongo/BaseRepositoryMongo.cs
+++ b/src/Samhammer.Mongo/BaseRepositoryMongo.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
+using MongoDB.Driver.Linq;
 using Samhammer.Mongo.Abstractions;
 using Samhammer.Mongo.Utils;
 
diff --git a/src/Samhammer.Mongo/Health/HealthChecksBuilderExtensions.cs b/src/Samhammer.Mongo/Health/HealthChecksBuilderExtensions.cs
index aba039e..4ce8327 100644
--- a/src/Samhammer.Mongo/Health/HealthChecksBuilderExtensions.cs
+++ b/src/Samhammer.Mongo/Health/HealthChecksBuilderExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Options;
+using MongoDB.Driver;
 using Samhammer.Mongo.Utils;
 
 namespace Samhammer.Mongo.Health
@@ -57,7 +58,8 @@ private static MongoDbHealthCheck GetMongoDbHealthCheck(IServiceProvider service
             }
 
             var mongoClientSettings = MongoDbUtils.GetMongoClientSettings(credential, "health");
-            return new MongoDbHealthCheck(mongoClientSettings, credential.DatabaseName);
+            var client = new MongoClient(mongoClientSettings);
+            return new MongoDbHealthCheck(client, credential.DatabaseName);
         }
     }
 }
diff --git a/src/Samhammer.Mongo/Samhammer.Mongo.csproj b/src/Samhammer.Mongo/Samhammer.Mongo.csproj
index e26d618..2bae975 100644
--- a/src/Samhammer.Mongo/Samhammer.Mongo.csproj
+++ b/src/Samhammer.Mongo/Samhammer.Mongo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
@@ -24,13 +24,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.30.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
+    <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.2" />
+    <PackageReference Include="MongoDB.Driver" Version="3.5.2" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>