diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 800cf7a..379ce3c 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/Elmah.Io.AspNetCore.sln b/Elmah.Io.AspNetCore.sln
index 503c44c..0dcdb01 100644
--- a/Elmah.Io.AspNetCore.sln
+++ b/Elmah.Io.AspNetCore.sln
@@ -28,11 +28,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elmah.Io.AspNetCore.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elmah.Io.AspNetCore.HealthChecks.Example", "samples\Elmah.Io.AspNetCore.HealthChecks.Example\Elmah.Io.AspNetCore.HealthChecks.Example.csproj", "{A4DDFAB9-076D-4CA4-9A6E-EF5550605BD3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elmah.Io.AspNetCore31.Example", "samples\Elmah.Io.AspNetCore31.Example\Elmah.Io.AspNetCore31.Example.csproj", "{6AF05883-55D8-4952-94E8-A5BF00F393A8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elmah.Io.AspNetCore60.Example", "samples\Elmah.Io.AspNetCore60.Example\Elmah.Io.AspNetCore60.Example.csproj", "{44812DB3-4FAD-4BF4-83D6-0807886A042B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elmah.Io.AspNetCore70.Example", "samples\Elmah.Io.AspNetCore70.Example\Elmah.Io.AspNetCore70.Example.csproj", "{C7C799CD-1C2A-4170-91B2-268060D99427}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elmah.Io.AspNetCore70.Example", "samples\Elmah.Io.AspNetCore70.Example\Elmah.Io.AspNetCore70.Example.csproj", "{C7C799CD-1C2A-4170-91B2-268060D99427}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elmah.Io.AspNetCore80.Example", "samples\Elmah.Io.AspNetCore80.Example\Elmah.Io.AspNetCore80.Example.csproj", "{96D3E57A-3734-4049-BAEA-E97A405AE4EE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -60,10 +60,6 @@ Global
 		{A4DDFAB9-076D-4CA4-9A6E-EF5550605BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4DDFAB9-076D-4CA4-9A6E-EF5550605BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4DDFAB9-076D-4CA4-9A6E-EF5550605BD3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AF05883-55D8-4952-94E8-A5BF00F393A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AF05883-55D8-4952-94E8-A5BF00F393A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AF05883-55D8-4952-94E8-A5BF00F393A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AF05883-55D8-4952-94E8-A5BF00F393A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44812DB3-4FAD-4BF4-83D6-0807886A042B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44812DB3-4FAD-4BF4-83D6-0807886A042B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44812DB3-4FAD-4BF4-83D6-0807886A042B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,6 +68,10 @@ Global
 		{C7C799CD-1C2A-4170-91B2-268060D99427}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C7C799CD-1C2A-4170-91B2-268060D99427}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7C799CD-1C2A-4170-91B2-268060D99427}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96D3E57A-3734-4049-BAEA-E97A405AE4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96D3E57A-3734-4049-BAEA-E97A405AE4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96D3E57A-3734-4049-BAEA-E97A405AE4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96D3E57A-3734-4049-BAEA-E97A405AE4EE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -82,9 +82,9 @@ Global
 		{143AD06F-4F57-4E6B-9C09-A38005E5C025} = {B9EC1066-4F47-4310-9553-1298325321D8}
 		{7F9CB9B1-BDB3-430B-84AF-0BCD8CE1C4F3} = {E0D4A60F-5411-4587-A085-D41117F83905}
 		{A4DDFAB9-076D-4CA4-9A6E-EF5550605BD3} = {AEAB4533-28CE-4CA9-9CD7-FC7FEF911204}
-		{6AF05883-55D8-4952-94E8-A5BF00F393A8} = {AEAB4533-28CE-4CA9-9CD7-FC7FEF911204}
 		{44812DB3-4FAD-4BF4-83D6-0807886A042B} = {AEAB4533-28CE-4CA9-9CD7-FC7FEF911204}
 		{C7C799CD-1C2A-4170-91B2-268060D99427} = {AEAB4533-28CE-4CA9-9CD7-FC7FEF911204}
+		{96D3E57A-3734-4049-BAEA-E97A405AE4EE} = {AEAB4533-28CE-4CA9-9CD7-FC7FEF911204}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DAE57CF5-2DDC-4EF5-85A3-BDA571A8E9A9}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Controllers/HomeController.cs b/samples/Elmah.Io.AspNetCore31.Example/Controllers/HomeController.cs
deleted file mode 100644
index 6af7300..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Controllers/HomeController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Elmah.Io.AspNetCore;
-using Elmah.Io.AspNetCore31.Example.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Diagnostics;
-
-namespace Elmah.Io.AspNetCore31.Example.Controllers
-{
-    public class HomeController : Controller
-    {
-        private readonly ILogger<HomeController> _logger;
-
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-
-        public IActionResult Index()
-        {
-            throw new Exception("Do you know what happened to the neanderthals, Bernard? We ate them.");
-        }
-
-        public IActionResult Privacy()
-        {
-            try
-            {
-                var i = 0;
-                var result = 42 / i;
-            }
-            catch (DivideByZeroException e)
-            {
-                e.Ship(HttpContext);
-            }
-
-            return View();
-        }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-        }
-    }
-}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Models/ErrorViewModel.cs b/samples/Elmah.Io.AspNetCore31.Example/Models/ErrorViewModel.cs
deleted file mode 100644
index e86cf0e..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Models/ErrorViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Elmah.Io.AspNetCore31.Example.Models
-{
-    public class ErrorViewModel
-    {
-        public string RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Program.cs b/samples/Elmah.Io.AspNetCore31.Example/Program.cs
deleted file mode 100644
index 97e3d48..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Program.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Elmah.Io.AspNetCore31.Example
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Startup.cs b/samples/Elmah.Io.AspNetCore31.Example/Startup.cs
deleted file mode 100644
index a4631b9..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Startup.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Net;
-
-namespace Elmah.Io.AspNetCore31.Example
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            Configuration = configuration;
-        }
-
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // IMPORTANT: this is where the magic happens. Insert your api key found on the profile as well as the log id of the log to log to.
-            services.AddElmahIo(options =>
-            {
-                options.ApiKey = "API_KEY";
-                options.LogId = new Guid("LOG_ID");
-
-                // Optional application name
-                //options.Application = "ASP.NET Core 3.1 Application";
-
-                // Add event handlers etc. like this:
-                //options.OnMessage = msg =>
-                //{
-                //    msg.Version = "3.1.0";
-                //};
-
-                // Remove comment on the following line to log through a proxy (in this case Fiddler).
-                //options.WebProxy = new WebProxy("localhost", 8888);
-            });
-
-            // ApiKey and LogId can be configured in appsettings.json as well, by calling the Configure-method instead of AddElmahIo.
-            //services.Configure<Elmah.Io.AspNetCore.ElmahIoOptions>(Configuration.GetSection("ElmahIo"));
-            // Still need to call this to register all dependencies
-            //services.AddElmahIo();
-
-            // If you configure ApiKey and LogId through appsettings.json, you can still add event handlers, configure handled status codes, etc.
-            //services.Configure<Elmah.Io.AspNetCore.ElmahIoOptions>(o =>
-            //{
-            //    o.OnMessage = msg =>
-            //    {
-            //        msg.Version = "3.1.0";
-            //    };
-            //});
-
-            services.AddControllersWithViews();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                app.UseExceptionHandler("/Home/Error");
-                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-                app.UseHsts();
-            }
-
-            // IMPORTANT: registers the elmah.io middleware (after registering other exception-aware middleware.
-            app.UseElmahIo();
-
-            app.UseHttpsRedirection();
-            app.UseStaticFiles();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllerRoute(
-                    name: "default",
-                    pattern: "{controller=Home}/{action=Index}/{id?}");
-            });
-        }
-    }
-}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/Home/Index.cshtml b/samples/Elmah.Io.AspNetCore31.Example/Views/Home/Index.cshtml
deleted file mode 100644
index d2d19bd..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<div class="text-center">
-    <h1 class="display-4">Welcome</h1>
-    <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
-</div>
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/_ViewImports.cshtml b/samples/Elmah.Io.AspNetCore31.Example/Views/_ViewImports.cshtml
deleted file mode 100644
index 5a4d456..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using Elmah.Io.AspNetCore31.Example
-@using Elmah.Io.AspNetCore31.Example.Models
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/samples/Elmah.Io.AspNetCore31.Example/appsettings.Development.json b/samples/Elmah.Io.AspNetCore31.Example/appsettings.Development.json
deleted file mode 100644
index 8983e0f..0000000
--- a/samples/Elmah.Io.AspNetCore31.Example/appsettings.Development.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}
diff --git a/samples/Elmah.Io.AspNetCore70.Example/Program.cs b/samples/Elmah.Io.AspNetCore70.Example/Program.cs
index 8df6235..8efd78e 100644
--- a/samples/Elmah.Io.AspNetCore70.Example/Program.cs
+++ b/samples/Elmah.Io.AspNetCore70.Example/Program.cs
@@ -35,7 +35,7 @@
 //{
 //    o.OnMessage = msg =>
 //    {
-//        msg.Version = "6.0.0";
+//        msg.Version = "7.0.0";
 //    };
 //});
 
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Elmah.Io.AspNetCore31.Example.csproj b/samples/Elmah.Io.AspNetCore80.Example/Elmah.Io.AspNetCore80.Example.csproj
similarity index 63%
rename from samples/Elmah.Io.AspNetCore31.Example/Elmah.Io.AspNetCore31.Example.csproj
rename to samples/Elmah.Io.AspNetCore80.Example/Elmah.Io.AspNetCore80.Example.csproj
index d3ee986..085fab9 100644
--- a/samples/Elmah.Io.AspNetCore31.Example/Elmah.Io.AspNetCore31.Example.csproj
+++ b/samples/Elmah.Io.AspNetCore80.Example/Elmah.Io.AspNetCore80.Example.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/Shared/Error.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml
similarity index 82%
rename from samples/Elmah.Io.AspNetCore31.Example/Views/Shared/Error.cshtml
rename to samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml
index a1e0478..6f92b95 100644
--- a/samples/Elmah.Io.AspNetCore31.Example/Views/Shared/Error.cshtml
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml
@@ -1,4 +1,5 @@
-@model ErrorViewModel
+@page
+@model ErrorModel
 @{
     ViewData["Title"] = "Error";
 }
@@ -15,7 +16,7 @@
 
 <h3>Development Mode</h3>
 <p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+    Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
 </p>
 <p>
     <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml.cs b/samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml.cs
new file mode 100644
index 0000000..ca59f45
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Error.cshtml.cs
@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Diagnostics;
+
+namespace Elmah.Io.AspNetCore80.Example.Pages
+{
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+    [IgnoreAntiforgeryToken]
+    public class ErrorModel : PageModel
+    {
+        public string? RequestId { get; set; }
+
+        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+        private readonly ILogger<ErrorModel> _logger;
+
+        public ErrorModel(ILogger<ErrorModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+        }
+    }
+
+}
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml
new file mode 100644
index 0000000..f9ff8d4
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml
@@ -0,0 +1,10 @@
+@page
+@model IndexModel
+@{
+    ViewData["Title"] = "Home page";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Welcome</h1>
+    <p>Learn about <a href="https://learn.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+</div>
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml.cs b/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml.cs
new file mode 100644
index 0000000..e1671a0
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Index.cshtml.cs
@@ -0,0 +1,26 @@
+using Elmah.Io.AspNetCore;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Elmah.Io.AspNetCore80.Example.Pages
+{
+    public class IndexModel : PageModel
+    {
+        private readonly ILogger<IndexModel> _logger;
+
+        public IndexModel(ILogger<IndexModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+            // Logging can be used for breadcrumbs
+            _logger.LogInformation("Requesting the frontpage");
+
+            // Breadcrumbs can also be added manually
+            //ElmahIoApi.AddBreadcrumb(new Client.Breadcrumb(action: "Navigation", message: "Requesting the frontpage"), HttpContext);
+
+            throw new Exception("Do you know what happened to the neanderthals, Bernard? We ate them.");
+        }
+    }
+}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/Home/Privacy.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml
similarity index 80%
rename from samples/Elmah.Io.AspNetCore31.Example/Views/Home/Privacy.cshtml
rename to samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml
index af4fb19..46ba966 100644
--- a/samples/Elmah.Io.AspNetCore31.Example/Views/Home/Privacy.cshtml
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml
@@ -1,4 +1,6 @@
-@{
+@page
+@model PrivacyModel
+@{
     ViewData["Title"] = "Privacy Policy";
 }
 <h1>@ViewData["Title"]</h1>
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml.cs b/samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml.cs
new file mode 100644
index 0000000..1c26a3a
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Privacy.cshtml.cs
@@ -0,0 +1,32 @@
+using Elmah.Io.AspNetCore;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Elmah.Io.AspNetCore80.Example.Pages
+{
+    public class PrivacyModel : PageModel
+    {
+        private readonly ILogger<PrivacyModel> _logger;
+
+        public PrivacyModel(ILogger<PrivacyModel> logger)
+        {
+            _logger = logger;
+        }
+
+        public void OnGet()
+        {
+            try
+            {
+                var i = 0;
+                var result = 42 / i;
+            }
+            catch (DivideByZeroException e)
+            {
+                e.Ship(HttpContext);
+
+                // Or the Log method on ElmahIoApi
+                //ElmahIoApi.Log(e, HttpContext);
+            }
+        }
+    }
+
+}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/Shared/_Layout.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml
similarity index 68%
rename from samples/Elmah.Io.AspNetCore31.Example/Views/Shared/_Layout.cshtml
rename to samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml
index 70d1ed1..5bb7d74 100644
--- a/samples/Elmah.Io.AspNetCore31.Example/Views/Shared/_Layout.cshtml
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml
@@ -3,26 +3,27 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - Elmah.Io.AspNetCore31.Example</title>
+    <title>@ViewData["Title"] - Elmah.Io.AspNetCore80.Example</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" />
+    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/Elmah.Io.AspNetCore80.Example.styles.css" asp-append-version="true" />
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Elmah.Io.AspNetCore31.Example</a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                <a class="navbar-brand" asp-area="" asp-page="/Index">Elmah.Io.AspNetCore80.Example</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
                         </li>
                     </ul>
                 </div>
@@ -37,12 +38,14 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2020 - Elmah.Io.AspNetCore31.Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2023 - Elmah.Io.AspNetCore80.Example - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
+
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
-    @RenderSection("Scripts", required: false)
+
+    @await RenderSectionAsync("Scripts", required: false)
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml.css b/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml.css
new file mode 100644
index 0000000..c187c02
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_Layout.cshtml.css
@@ -0,0 +1,48 @@
+/* Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+a {
+  color: #0077cc;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px;
+}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/Shared/_ValidationScriptsPartial.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from samples/Elmah.Io.AspNetCore31.Example/Views/Shared/_ValidationScriptsPartial.cshtml
rename to samples/Elmah.Io.AspNetCore80.Example/Pages/Shared/_ValidationScriptsPartial.cshtml
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Pages/_ViewImports.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/_ViewImports.cshtml
new file mode 100644
index 0000000..c30aa92
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using Elmah.Io.AspNetCore80.Example
+@namespace Elmah.Io.AspNetCore80.Example.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/samples/Elmah.Io.AspNetCore31.Example/Views/_ViewStart.cshtml b/samples/Elmah.Io.AspNetCore80.Example/Pages/_ViewStart.cshtml
similarity index 100%
rename from samples/Elmah.Io.AspNetCore31.Example/Views/_ViewStart.cshtml
rename to samples/Elmah.Io.AspNetCore80.Example/Pages/_ViewStart.cshtml
diff --git a/samples/Elmah.Io.AspNetCore80.Example/Program.cs b/samples/Elmah.Io.AspNetCore80.Example/Program.cs
new file mode 100644
index 0000000..c16e0da
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/Program.cs
@@ -0,0 +1,67 @@
+var builder = WebApplication.CreateBuilder(args);
+
+// IMPORTANT: this is where the magic happens. Insert your api key found on the profile as well as the log id of the log to log to.
+builder.Services.AddElmahIo(options =>
+{
+    options.ApiKey = "API_KEY";
+    options.LogId = new Guid("LOG_ID");
+
+    // Use log messages logged through Microsoft.Extensions.Logging as breadcrumbs
+    options.TreatLoggingAsBreadcrumbs = true;
+
+    // Filter out breadcrumbs you don't want (like some messages logged through Microsoft.Extensions.Logging)
+    //options.OnFilterBreadcrumb = breadcrumb => breadcrumb.Message == "A message we don't want as a breadcrumb";
+
+    // Optional application name
+    //options.Application = "ASP.NET Core 8.0 Application";
+
+    // Add event handlers etc. like this:
+    //options.OnMessage = msg =>
+    //{
+    //    msg.Version = "8.0.0";
+    //};
+
+    // Remove comment on the following line to log through a proxy (in this case Fiddler).
+    //options.WebProxy = new WebProxy("localhost", 8888);
+});
+
+// ApiKey and LogId can be configured in appsettings.json as well, by calling the Configure-method instead of AddElmahIo.
+//builder.Services.Configure<Elmah.Io.AspNetCore.ElmahIoOptions>(builder.Configuration.GetSection("ElmahIo"));
+// Still need to call this to register all dependencies
+//builder.Services.AddElmahIo();
+
+// If you configure ApiKey and LogId through appsettings.json, you can still add event handlers, configure handled status codes, etc.
+//builder.Services.Configure<Elmah.Io.AspNetCore.ElmahIoOptions>(o =>
+//{
+//    o.OnMessage = msg =>
+//    {
+//        msg.Version = "8.0.0";
+//    };
+//});
+
+// Add services to the container.
+builder.Services.AddRazorPages();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+    app.UseExceptionHandler("/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+// IMPORTANT: registers the elmah.io middleware (after registering other exception-aware middleware.
+app.UseElmahIo();
+
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthorization();
+
+app.MapRazorPages();
+
+app.Run();
diff --git a/samples/Elmah.Io.AspNetCore80.Example/appsettings.Development.json b/samples/Elmah.Io.AspNetCore80.Example/appsettings.Development.json
new file mode 100644
index 0000000..770d3e9
--- /dev/null
+++ b/samples/Elmah.Io.AspNetCore80.Example/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/samples/Elmah.Io.AspNetCore31.Example/appsettings.json b/samples/Elmah.Io.AspNetCore80.Example/appsettings.json
similarity index 64%
rename from samples/Elmah.Io.AspNetCore31.Example/appsettings.json
rename to samples/Elmah.Io.AspNetCore80.Example/appsettings.json
index f8962bf..5b52b67 100644
--- a/samples/Elmah.Io.AspNetCore31.Example/appsettings.json
+++ b/samples/Elmah.Io.AspNetCore80.Example/appsettings.json
@@ -2,12 +2,11 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.AspNetCore": "Warning"
     }
   },
   "AllowedHosts": "*",
-  // The following section is only needed if configuring elmah.io using the Configure-method in ConfigureServices.
+  // The following section is only needed if configuring elmah.io using the Configure-method in ConfigureServices or Program.
   "ElmahIo": {
     "ApiKey": "API_KEY",
     "LogId": "LOG_ID"
diff --git a/samples/README.md b/samples/README.md
index 791014e..2ca7c9e 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -5,6 +5,6 @@ This directory contains samples to show how to integrate elmah.io into ASP.NET C
 ## Samples list
 
 * **Elmah.Io.AspNetCore.HealthChecks.Example** - Shows how to integrate ASP.NET Core Health Checks with elmah.io.
-* **Elmah.Io.AspNetCore31.Example** - Integrate elmah.io into ASP.NET Core v3.1.
 * **Elmah.Io.AspNetCore60.Example** - Integrate elmah.io into ASP.NET Core v6.0.
-* **Elmah.Io.AspNetCore70.Example** - Integrate elmah.io into ASP.NET Core v7.0.
\ No newline at end of file
+* **Elmah.Io.AspNetCore70.Example** - Integrate elmah.io into ASP.NET Core v7.0.
+* **Elmah.Io.AspNetCore80.Example** - Integrate elmah.io into ASP.NET Core v8.0.
\ No newline at end of file
diff --git a/src/Elmah.Io.AspNetCore.HealthChecks/Elmah.Io.AspNetCore.HealthChecks.csproj b/src/Elmah.Io.AspNetCore.HealthChecks/Elmah.Io.AspNetCore.HealthChecks.csproj
index 69b7d86..ad0ca3e 100644
--- a/src/Elmah.Io.AspNetCore.HealthChecks/Elmah.Io.AspNetCore.HealthChecks.csproj
+++ b/src/Elmah.Io.AspNetCore.HealthChecks/Elmah.Io.AspNetCore.HealthChecks.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elmah.Io.Client" Version="[5.0.66,6)" />
+    <PackageReference Include="Elmah.Io.Client" Version="[5.1.71-pre,6)" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/src/Elmah.Io.AspNetCore/Elmah.Io.AspNetCore.csproj b/src/Elmah.Io.AspNetCore/Elmah.Io.AspNetCore.csproj
index 3d0407c..52c457b 100644
--- a/src/Elmah.Io.AspNetCore/Elmah.Io.AspNetCore.csproj
+++ b/src/Elmah.Io.AspNetCore/Elmah.Io.AspNetCore.csproj
@@ -34,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elmah.Io.Client" Version="[5.0.66,6)" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.0" />
+    <PackageReference Include="Elmah.Io.Client" Version="[5.1.71-pre,6)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Elmah.Io.AspNetCore.Tests/Elmah.Io.AspNetCore.Tests.csproj b/test/Elmah.Io.AspNetCore.Tests/Elmah.Io.AspNetCore.Tests.csproj
index f631a8c..0dd79c1 100644
--- a/test/Elmah.Io.AspNetCore.Tests/Elmah.Io.AspNetCore.Tests.csproj
+++ b/test/Elmah.Io.AspNetCore.Tests/Elmah.Io.AspNetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Elmah.Io.AspNetCore.Tests</AssemblyName>
     <PackageId>Elmah.Io.AspNetCore.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>