diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs
index 5568d81..945dc8b 100644
--- a/OpenIddict/OpenIddictIdP/Startup.cs
+++ b/OpenIddict/OpenIddictIdP/Startup.cs
@@ -119,20 +119,15 @@ public void ConfigureServices(IServiceCollection services)
                 {
                     //use quartz to prune old SAML messages every 14 days.
                     builder.PruneSamlMessages();
+                    builder.PruneSamlArtifacts();
                     
                     //Already added the DbContext above
                     builder.UseSamlEntityFrameworkCore()
-                        .AddSamlMessageDbContext(optionsBuilder =>
-                        {
-                            //Configure the database provider to use.
-                            optionsBuilder.UseSqlServer(defaultConnectionString, x =>x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
-                        })
-                        .AddSamlConfigurationDbContext(optionsBuilder =>
-                        {
-                            //Configure the database provider to use.
-                            optionsBuilder.UseSqlServer(defaultConnectionString,
-                                x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
-                        });
+                        .AddSamlDbContexts(optionsBuilder =>
+                    {
+                        //Configure the database provider to use.
+                        optionsBuilder.UseSqlServer(defaultConnectionString, x => x.MigrationsAssembly(typeof(Startup).Assembly.FullName));
+                    });
 
                     builder.ConfigureSamlOpenIddictServerOptions(serverOptions =>
                         {