diff --git a/Agoda.Frameworks.DB/Agoda.Frameworks.DB.csproj b/Agoda.Frameworks.DB/Agoda.Frameworks.DB.csproj
index 69fd482..918af0c 100644
--- a/Agoda.Frameworks.DB/Agoda.Frameworks.DB.csproj
+++ b/Agoda.Frameworks.DB/Agoda.Frameworks.DB.csproj
@@ -18,9 +18,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.30" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Agoda.Frameworks.LoadBalancing\Agoda.Frameworks.LoadBalancing.csproj" />
diff --git a/Agoda.Frameworks.DB/DbRepository.cs b/Agoda.Frameworks.DB/DbRepository.cs
index 699dd4e..2fcf1de 100644
--- a/Agoda.Frameworks.DB/DbRepository.cs
+++ b/Agoda.Frameworks.DB/DbRepository.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Agoda.Frameworks.DB/DbRepositorySimplified.cs b/Agoda.Frameworks.DB/DbRepositorySimplified.cs
index 3f42e5a..edba6c2 100644
--- a/Agoda.Frameworks.DB/DbRepositorySimplified.cs
+++ b/Agoda.Frameworks.DB/DbRepositorySimplified.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text;
diff --git a/Agoda.Frameworks.DB/IDbRepository.cs b/Agoda.Frameworks.DB/IDbRepository.cs
index 1d84d8a..a246a09 100644
--- a/Agoda.Frameworks.DB/IDbRepository.cs
+++ b/Agoda.Frameworks.DB/IDbRepository.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
+
 using System.Threading.Tasks;
 
 namespace Agoda.Frameworks.DB