diff --git a/src/BuildingBlocks/BuildingBlocks.csproj b/src/BuildingBlocks/BuildingBlocks.csproj
index d48bf55..209c5e7 100644
--- a/src/BuildingBlocks/BuildingBlocks.csproj
+++ b/src/BuildingBlocks/BuildingBlocks.csproj
@@ -19,6 +19,7 @@
         <PackageReference Include="FluentValidation" Version="11.9.2" />
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
         <PackageReference Include="Grpc.Net.Client" Version="2.64.0" />
+        <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
         <PackageReference Include="MagicOnion" Version="6.1.4" />
         <PackageReference Include="MagicOnion.Abstractions" Version="6.1.4" />
         <PackageReference Include="MagicOnion.Client" Version="6.1.4" />
diff --git a/src/BuildingBlocks/Jwt/JwtExtensions.cs b/src/BuildingBlocks/Jwt/JwtExtensions.cs
index e526541..d1f899e 100644
--- a/src/BuildingBlocks/Jwt/JwtExtensions.cs
+++ b/src/BuildingBlocks/Jwt/JwtExtensions.cs
@@ -1,6 +1,7 @@
 using BuildingBlocks.Utils;
 using BuildingBlocks.Web;
 using Duende.IdentityServer.Models;
+using IdentityServer4.AccessTokenValidation;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -12,7 +13,12 @@ public static IServiceCollection AddJwt(this IServiceCollection services)
     {
         var jwtOptions = services.GetOptions<JwtBearerOptions>("Jwt");
 
-        services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+        services.AddAuthentication(options =>
+        {
+            options.DefaultScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
+            options.DefaultAuthenticateScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
+            options.DefaultChallengeScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
+        })
             .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options =>
             {
                 options.Authority = jwtOptions.Authority;
@@ -32,4 +38,4 @@ public static IServiceCollection AddJwt(this IServiceCollection services)
 
         return services;
     }
-}
+}
\ No newline at end of file