diff --git a/src/Org/Extensions/HostingExtensions.cs b/src/Org/Extensions/HostingExtensions.cs
index 1c927e8c..3e6c7136 100644
--- a/src/Org/Extensions/HostingExtensions.cs
+++ b/src/Org/Extensions/HostingExtensions.cs
@@ -130,7 +130,8 @@ public static class HostingExtensions
                      options.Authority = builder.Configuration.GetSection("Site")["Authority"];
                      options.Audience = builder.Configuration.GetSection("Site")["Audience"];
                      options.TokenValidationParameters =
-                         new() {
+                         new()
+                         {
                              ValidateAudience = false,
                              RoleClaimType = Constants.RoleClaimType
                          };
@@ -148,7 +149,7 @@ public static class HostingExtensions
         IServiceCollection services = builder.Services;
         services.AddDbContext<ApplicationDbContext>(options =>
         {
-            options.UseNpgsql(builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName ),
+            options.UseNpgsql(builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName),
                 options => options.MigrationsAssembly(typeof(Program).Assembly));
         });
 
@@ -257,6 +258,12 @@ public static class HostingExtensions
     }
     private static IIdentityServerBuilder AddIdentityServer(WebApplicationBuilder builder)
     {
+        builder.Services.Configure<IdentityOptions>(options =>
+        {
+            options.ClaimsIdentity.UserIdClaimType = JwtClaimTypes.Subject;
+            options.ClaimsIdentity.UserNameClaimType = JwtClaimTypes.Name;
+            options.ClaimsIdentity.RoleClaimType = Constants.RoleClaimType;
+        });
         var migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name;
         var connectionString = builder.Configuration.GetConnectionString(Constants.YavscConnectionStringName);
 
@@ -289,33 +296,10 @@ public static class HostingExtensions
                     sql => sql.MigrationsAssembly(migrationsAssembly));
             });
 
-
-        builder.Services.Configure<IdentityOptions>(options =>
-        {
-            options.ClaimsIdentity.UserIdClaimType = JwtClaimTypes.Subject;
-            options.ClaimsIdentity.UserNameClaimType = JwtClaimTypes.Name;
-            options.ClaimsIdentity.RoleClaimType = Constants.RoleClaimType;
-        });
-
         if (builder.Environment.IsDevelopment())
         {
             identityServerBuilder.AddDeveloperSigningCredential();
         }
-        else
-        {
-            var path = builder.Configuration["SigningCert:Path"];
-            if (path == null)
-                throw new InvalidConfigurationException("No signing cert path");
-            FileInfo certFileInfo = new FileInfo(path);
-            Debug.Assert(certFileInfo.Exists);
-            RSA rsa = RSA.Create();
-            rsa.ImportFromPem(File.ReadAllText(certFileInfo.FullName));
-            var signingCredentials = new SigningCredentials(new RsaSecurityKey(rsa), SecurityAlgorithms.RsaSha256)
-            {
-                CryptoProviderFactory = new CryptoProviderFactory { CacheSignatureProviders = false }
-            };
-            identityServerBuilder.AddSigningCredential(signingCredentials);
-        }
         return identityServerBuilder;
     }
 
diff --git a/test/yavscTests/Mandatory/Services.cs b/test/yavscTests/Mandatory/Services.cs
new file mode 100644
index 00000000..8ac6feb5
--- /dev/null
+++ b/test/yavscTests/Mandatory/Services.cs
@@ -0,0 +1,16 @@
+using isnd.tests;
+using Xunit.Abstractions;
+
+namespace yavscTests.Mandatory;
+
+[Collection("Yavsc Server")]
+[Trait("regression", "oui")]
+public class Services : BaseTestContext, IClassFixture<WebServerFixture>
+{
+  public Services(ITestOutputHelper output, WebServerFixture fixture) : base(output, fixture)
+  {
+
+  }
+  
+  
+}
diff --git a/test/yavscTests/yavscTests.csproj b/test/yavscTests/yavscTests.csproj
index 81de4b76..40d81337 100644
--- a/test/yavscTests/yavscTests.csproj
+++ b/test/yavscTests/yavscTests.csproj
@@ -31,4 +31,4 @@
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file