diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12824b28..0f4f2a09 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-test:
     strategy:
       matrix:
-        dotnet: ["6.0", "7.0", "8.0"]
+        dotnet: ['6.0.x', '7.0.x', '8.0.x']
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -17,8 +17,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "8.0.100-preview.7.23376.3"
-      
+          dotnet-version: '8.0.x'
       - name: build
         run: dotnet build
       - name: test Finbuckle.MultiTenant
diff --git a/.github/workflows/nuget-push-public.yml b/.github/workflows/nuget-push-public.yml
index c3bc4fec..18f77c39 100644
--- a/.github/workflows/nuget-push-public.yml
+++ b/.github/workflows/nuget-push-public.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "8.0.100-preview.7.23376.3"
+          dotnet-version: "8.0.x"
       - name: Create the package
         run: dotnet test -c Release && dotnet pack --no-build -c Release --output nupkgs
       - name: Publish the package to NuGet.org
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 485d1a8d..bbdc6d81 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "8.0.100-preview.7.23376.3"
+          dotnet-version: "8.0.x"
       - uses: actions/setup-node@v3
         with:
           node-version: 18
diff --git a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj
index e2323806..a0f47c5a 100644
--- a/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj
+++ b/src/Finbuckle.MultiTenant.AspNetCore/Finbuckle.MultiTenant.AspNetCore.csproj
@@ -16,7 +16,7 @@
     <When Condition=" '$(TargetFramework)' == 'net8.0' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0-*" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'net7.0' ">
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
index 4eb3a952..73412814 100644
--- a/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
+++ b/src/Finbuckle.MultiTenant.EntityFrameworkCore/Finbuckle.MultiTenant.EntityFrameworkCore.csproj
@@ -15,9 +15,9 @@
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'net8.0' ">
       <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-*" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0-*" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'net7.0' ">
diff --git a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
index ba96ee1b..c0f34a9a 100644
--- a/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
+++ b/src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
@@ -14,13 +14,13 @@
     <Choose>
         <When Condition=" '$(TargetFramework)' == 'net8.0' ">
             <ItemGroup>
-                <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-*" />
-                <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-*" />
+                <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+                <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
             </ItemGroup>
         </When>
         <When Condition=" '$(TargetFramework)' == 'net7.0' ">
diff --git a/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj b/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj
index 0dfeeb23..b7ba6f25 100644
--- a/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj
+++ b/test/Finbuckle.MultiTenant.AspNetCore.Test/Finbuckle.MultiTenant.AspNetCore.Test.csproj
@@ -13,7 +13,7 @@
     <When Condition=" '$(TargetFramework)' == 'net8.0' ">
       <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.*-*" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'net7.0' ">
diff --git a/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj b/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
index 8b675ba5..062d184f 100644
--- a/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
+++ b/test/Finbuckle.MultiTenant.EntityFrameworkCore.Test/Finbuckle.MultiTenant.EntityFrameworkCore.Test.csproj
@@ -13,8 +13,8 @@
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'net8.0' ">
       <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.*-*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'net7.0' ">
diff --git a/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj b/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj
index c72a51bc..15d04b67 100644
--- a/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj
+++ b/test/Finbuckle.MultiTenant.Test/Finbuckle.MultiTenant.Test.csproj
@@ -12,9 +12,9 @@
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'net8.0' ">
       <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.*-*" />
-        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.*-*" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.*" />
+        <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.*" />
       </ItemGroup>
     </When>
     <When Condition=" '$(TargetFramework)' == 'net7.0' ">