diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55d6e2fa..a5f9ce71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,9 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9'
+          dotnet-version: |
+            8
+            9
       - 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 4f2a4fd8..63822ee8 100644
--- a/.github/workflows/nuget-push-public.yml
+++ b/.github/workflows/nuget-push-public.yml
@@ -9,7 +9,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9'
+          dotnet-version: |
+            8
+            9
       - name: Create the package
         run: dotnet test -c Release -p:ContinuousIntegrationBuild=true && dotnet pack --no-build -c Release --output nupkgs
       - name: Publish the package to NuGet.org
diff --git a/.github/workflows/release-dryrun.yml b/.github/workflows/release-dryrun.yml
index 504be457..8da8ac33 100644
--- a/.github/workflows/release-dryrun.yml
+++ b/.github/workflows/release-dryrun.yml
@@ -12,7 +12,9 @@ jobs:
           node-version: 20
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9'
+          dotnet-version: |
+            8
+            9
       - name: build and test
         run: |
           dotnet restore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2966379..705bb671 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,9 @@ jobs:
           node-version: 20
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9'
+          dotnet-version: |
+            8
+            9
       - name: build and test
         run: |
           dotnet restore
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs
index fb1a64fa..1a150549 100644
--- a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs
+++ b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantDbContext.cs
@@ -28,7 +28,7 @@ public abstract class MultiTenantDbContext : DbContext, IMultiTenantDbContext
     /// <typeparam name="TContext">The TContext implementation type.</typeparam>
     /// <typeparam name="TTenantInfo">The ITenantInfo implementation type.</typeparam>
     /// <returns></returns>
-    public static TContext Create<TContext, TTenantInfo>(TTenantInfo? tenantInfo)
+    public static TContext Create<TContext, TTenantInfo>(TTenantInfo tenantInfo)
         where TContext : DbContext
         where TTenantInfo : class, ITenantInfo, new()
     => Create<TContext, TTenantInfo>(tenantInfo, null);
@@ -41,7 +41,7 @@ public static TContext Create<TContext, TTenantInfo>(TTenantInfo? tenantInfo)
     /// <typeparam name="TContext">The TContext implementation type.</typeparam>
     /// <typeparam name="TTenantInfo">The ITenantInfo implementation type.</typeparam>
     /// <returns></returns>
-    public static TContext Create<TContext, TTenantInfo>(TTenantInfo? tenantInfo, DbContextOptions? options)
+    public static TContext Create<TContext, TTenantInfo>(TTenantInfo tenantInfo, DbContextOptions? options)
         where TContext : DbContext
         where TTenantInfo : class, ITenantInfo, new()
     {