diff --git a/IdentityServer/v8/IdentityServerHost/src/HostingExtensions.cs b/IdentityServer/v8/IdentityServerHost/src/HostingExtensions.cs
index 339769d5..8afdb589 100644
--- a/IdentityServer/v8/IdentityServerHost/src/HostingExtensions.cs
+++ b/IdentityServer/v8/IdentityServerHost/src/HostingExtensions.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Duende.ConformanceReport.Endpoints;
 using Duende.IdentityServer;
+using Duende.IdentityServer.ConformanceReport;
 using IdentityServerHost;
 using Serilog;
 
@@ -11,19 +13,20 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
     {
         builder.Services.AddRazorPages();
 
-        var idsvrBuilder = builder.Services.AddIdentityServer(options =>
-        {
-            options.Events.RaiseErrorEvents = true;
-            options.Events.RaiseInformationEvents = true;
-            options.Events.RaiseFailureEvents = true;
-            options.Events.RaiseSuccessEvents = true;
+        var idsvrBuilder = builder.Services
+            .AddIdentityServer(options =>
+            {
+                options.Events.RaiseErrorEvents = true;
+                options.Events.RaiseInformationEvents = true;
+                options.Events.RaiseFailureEvents = true;
+                options.Events.RaiseSuccessEvents = true;
 
-            // see https://docs.duendesoftware.com/identityserver/fundamentals/resources/api-scopes
-            options.EmitStaticAudienceClaim = true;
-            options.PushedAuthorization.AllowUnregisteredPushedRedirectUris = true;
+                // see https://docs.duendesoftware.com/identityserver/fundamentals/resources/api-scopes
+                options.EmitStaticAudienceClaim = true;
+                options.PushedAuthorization.AllowUnregisteredPushedRedirectUris = true;
 
-            options.Preview.StrictClientAssertionAudienceValidation = true;
-        })
+                options.Preview.StrictClientAssertionAudienceValidation = true;
+            })
             .AddTestUsers(TestUsers.Users);
 
         idsvrBuilder.AddInMemoryIdentityResources(Resources.Identity);
@@ -31,6 +34,12 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
         idsvrBuilder.AddInMemoryApiResources(Resources.ApiResources);
         idsvrBuilder.AddInMemoryClients(Clients.List);
 
+        // Add conformance report
+        idsvrBuilder.AddConformanceReport(options =>
+        {
+            options.Enabled = true;
+        });
+
         // this is only needed for the JAR and JWT samples and adds supports for JWT-based client authentication
         idsvrBuilder.AddJwtBearerClientAuthentication();
 
@@ -70,6 +79,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
         app.UseRouting();
         app.UseIdentityServer();
         app.UseAuthorization();
+        app.MapConformanceReport();
         app.MapRazorPages();
 
         return app;
diff --git a/IdentityServer/v8/IdentityServerHost/src/IdentityServerHost.csproj b/IdentityServer/v8/IdentityServerHost/src/IdentityServerHost.csproj
index 2143ce9b..db7ac524 100755
--- a/IdentityServer/v8/IdentityServerHost/src/IdentityServerHost.csproj
+++ b/IdentityServer/v8/IdentityServerHost/src/IdentityServerHost.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Duende.IdentityServer" Version="8.0.0-alpha.1" />
+    <PackageReference Include="Duende.IdentityServer.ConformanceReport" Version="0.1.0-alpha.0.3488" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
   </ItemGroup>
 
diff --git a/IdentityServer/v8/IdentityServerHost/src/Pages/Index.cshtml b/IdentityServer/v8/IdentityServerHost/src/Pages/Index.cshtml
index 440a8fc6..73b23f0c 100644
--- a/IdentityServer/v8/IdentityServerHost/src/Pages/Index.cshtml
+++ b/IdentityServer/v8/IdentityServerHost/src/Pages/Index.cshtml
@@ -21,7 +21,10 @@
             Click <a href="~/grants">here</a> to manage your stored grants.
         </li>
         <li>
-            Click <a href="~/ciba/all">here</a> to view your pending CIBA login requests.
+          Click <a href="~/ciba/all">here</a> to view your pending CIBA login requests.
+        </li>
+        <li>
+            Click <a href="~/_duende/conformance-report">here</a> to view the FAPI conformance report.
         </li>
         <li>
             Here are links to the