diff --git a/Abblix.Jwt.UnitTests/JwtEncryptionTests.cs b/Abblix.Jwt.UnitTests/JwtEncryptionTests.cs
index 5adb7401..c0c4e284 100644
--- a/Abblix.Jwt.UnitTests/JwtEncryptionTests.cs
+++ b/Abblix.Jwt.UnitTests/JwtEncryptionTests.cs
@@ -27,7 +27,6 @@
 // For more information, please refer to the license agreement located at:
 // https://github.com/Abblix/Oidc.Server/blob/master/README.md
 
-using System.Security.Cryptography;
 using System.Text.Json.Nodes;
 using Abblix.Utils;
 using Microsoft.IdentityModel.Tokens;
@@ -37,13 +36,8 @@ namespace Abblix.Jwt.UnitTests;
 
 public class JwtEncryptionTests
 {
-    // Generates an RSA key for encryption.
-    private static readonly JsonWebKey EncryptingKey = JsonWebKeyFactory.CreateRsa(JsonWebKeyUseNames.Enc, 2048);
-
-    // Generates an RSA key for signing.
-    private static readonly JsonWebKey SigningKey = JsonWebKeyFactory.CreateRsa(JsonWebKeyUseNames.Sig, 2048);
-
-    // Helper method to generate RSA JsonWebKey.
+    private static readonly JsonWebKey EncryptingKey = JsonWebKeyFactory.CreateRsa(JsonWebKeyUseNames.Enc);
+    private static readonly JsonWebKey SigningKey = JsonWebKeyFactory.CreateRsa(JsonWebKeyUseNames.Sig);
 
     [Fact]
     public async Task JwtFullCycleTest()
diff --git a/Abblix.Jwt/JsonWebKeyFactory.cs b/Abblix.Jwt/JsonWebKeyFactory.cs
index 430ac9cb..77794382 100644
--- a/Abblix.Jwt/JsonWebKeyFactory.cs
+++ b/Abblix.Jwt/JsonWebKeyFactory.cs
@@ -50,9 +50,10 @@ public static class JsonWebKeyFactory
     {
         var algorithm = usage switch
         {
-            JsonWebKeyUseNames.Sig => "RS256",
-            JsonWebKeyUseNames.Enc => "RS256",
-            _ => throw new ArgumentException("Invalid usage specified. Valid options are 'sig' for signing or 'enc' for encryption.", nameof(usage))
+            JsonWebKeyUseNames.Sig or JsonWebKeyUseNames.Enc => "RS256",
+            _ => throw new ArgumentException(
+                $"Invalid usage specified. Valid options are '{JsonWebKeyUseNames.Sig}' for signing or '{JsonWebKeyUseNames.Enc}' for encryption.",
+                nameof(usage))
         };
 
         using var rsa = RSA.Create();
diff --git a/Abblix.Oidc.Server/Features/Tokens/Formatters/ClientJwtFormatter.cs b/Abblix.Oidc.Server/Features/Tokens/Formatters/ClientJwtFormatter.cs
index fd0b63a9..8c1970bc 100644
--- a/Abblix.Oidc.Server/Features/Tokens/Formatters/ClientJwtFormatter.cs
+++ b/Abblix.Oidc.Server/Features/Tokens/Formatters/ClientJwtFormatter.cs
@@ -69,7 +69,7 @@ public ClientJwtFormatter(
     /// </remarks>
     public async Task<string> FormatAsync(JsonWebToken token, ClientInfo clientInfo)
     {
-        var signingCredentials = await _serviceKeysProvider.GetSigningKeys()
+        var signingCredentials = await _serviceKeysProvider.GetSigningKeys(true)
             .FirstByAlgorithmAsync(token.Header.Algorithm);
 
         var encryptingCredentials = await _clientKeysProvider.GetEncryptionKeys(clientInfo)