diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2c2207765a..646303668a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -24,7 +24,7 @@
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageVersion Include="Azure.Storage.Files.Shares" Version="12.17.1" />
     <PackageVersion Include="Azure.Storage.Queues" Version="12.17.1" />
-    <PackageVersion Include="ClickHouse.Client" Version="7.8.2" />
+    <PackageVersion Include="ClickHouse.Driver" Version="0.7.20" />
     <PackageVersion Include="Confluent.Kafka" Version="2.3.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="Dapr.Client" Version="1.12.0" />
diff --git a/src/HealthChecks.ClickHouse/ClickHouseHealthCheck.cs b/src/HealthChecks.ClickHouse/ClickHouseHealthCheck.cs
index 5dba494c66..14744b333a 100644
--- a/src/HealthChecks.ClickHouse/ClickHouseHealthCheck.cs
+++ b/src/HealthChecks.ClickHouse/ClickHouseHealthCheck.cs
@@ -1,4 +1,4 @@
-using ClickHouse.Client.ADO;
+using ClickHouse.Driver.ADO;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
 namespace HealthChecks.ClickHouse;
@@ -26,10 +26,10 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             await _connection.OpenAsync(cancellationToken).ConfigureAwait(false);
 
-            using var command = _connection.CreateCommand();
+            await using var command = _connection.CreateCommand();
             command.CommandText = _command;
 
-            await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false);
+            _ = await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false);
 
             return HealthCheckResult.Healthy();
         }
diff --git a/src/HealthChecks.ClickHouse/DependencyInjection/ClickHouseHealthCheckBuilderExtensions.cs b/src/HealthChecks.ClickHouse/DependencyInjection/ClickHouseHealthCheckBuilderExtensions.cs
index 8090c4e0e9..5bc9cee346 100644
--- a/src/HealthChecks.ClickHouse/DependencyInjection/ClickHouseHealthCheckBuilderExtensions.cs
+++ b/src/HealthChecks.ClickHouse/DependencyInjection/ClickHouseHealthCheckBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using ClickHouse.Client.ADO;
+using ClickHouse.Driver.ADO;
 using HealthChecks.ClickHouse;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
diff --git a/src/HealthChecks.ClickHouse/HealthChecks.ClickHouse.csproj b/src/HealthChecks.ClickHouse/HealthChecks.ClickHouse.csproj
index 7036eb3f29..491b612b2a 100644
--- a/src/HealthChecks.ClickHouse/HealthChecks.ClickHouse.csproj
+++ b/src/HealthChecks.ClickHouse/HealthChecks.ClickHouse.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClickHouse.Client" />
+    <PackageReference Include="ClickHouse.Driver" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.ClickHouse/README.md b/src/HealthChecks.ClickHouse/README.md
index 743c8fccfe..f2c6359db4 100644
--- a/src/HealthChecks.ClickHouse/README.md
+++ b/src/HealthChecks.ClickHouse/README.md
@@ -1,10 +1,10 @@
 ## ClickHouse Health Check
 
-This health check verifies the ability to communicate with [ClickHouse](https://www.clickhouse.com/). It uses the [ClickHouse.Client](https://www.nuget.org/packages/ClickHouse.Client) library.
+This health check verifies the ability to communicate with [ClickHouse](https://www.clickhouse.com/). It uses the [ClickHouse.Driver](https://www.nuget.org/packages/ClickHouse.Driver) library.
 
 ## Recommended approach
 
-When registering the ClickHouse health check, it is [recommended](https://github.com/DarkWanderer/ClickHouse.Client/wiki/Connection-lifetime-&-pooling#recommendations) to use `IHttpClientFactory` or a static instance of `HttpClient` to manage connections.
+When registering the ClickHouse health check, it is recommended to use `IHttpClientFactory` or a static instance of `HttpClient` to manage connections.
 
 ```csharp
 void Configure(IServiceCollection services)
diff --git a/test/HealthChecks.ClickHouse.Tests/DependencyInjection/RegistrationTests.cs b/test/HealthChecks.ClickHouse.Tests/DependencyInjection/RegistrationTests.cs
index 53eb515969..a225cfb038 100644
--- a/test/HealthChecks.ClickHouse.Tests/DependencyInjection/RegistrationTests.cs
+++ b/test/HealthChecks.ClickHouse.Tests/DependencyInjection/RegistrationTests.cs
@@ -1,4 +1,4 @@
-using ClickHouse.Client.ADO;
+using ClickHouse.Driver.ADO;
 
 namespace HealthChecks.ClickHouse.Tests.DependencyInjection;
 
diff --git a/test/HealthChecks.ClickHouse.Tests/Functional/ClickHouseHealthCheckTests.cs b/test/HealthChecks.ClickHouse.Tests/Functional/ClickHouseHealthCheckTests.cs
index 3cbf9f8552..857fe4a662 100644
--- a/test/HealthChecks.ClickHouse.Tests/Functional/ClickHouseHealthCheckTests.cs
+++ b/test/HealthChecks.ClickHouse.Tests/Functional/ClickHouseHealthCheckTests.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using ClickHouse.Client.ADO;
+using ClickHouse.Driver.ADO;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;