diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 68b66ff71..b169edaf6 100644
--- a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -13,7 +13,7 @@ public static void AddFilterListsApi(this IServiceCollection services)
             services.ConfigureCookiePolicy();
             services.AddMemoryCache();
             services.AddResponseCaching();
-            services.AddMvcCustom();
+            services.AddControllersCustom();
             services.AddRoutingCustom();
             services.AddApiVersioning();
         }
@@ -25,7 +25,7 @@ private static void ConfigureCookiePolicy(this IServiceCollection services) =>
                 opts.MinimumSameSitePolicy = SameSiteMode.None;
             });
 
-        private static void AddMvcCustom(this IServiceCollection services) =>
+        private static void AddControllersCustom(this IServiceCollection services) =>
             services.AddControllers()
                     .SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
                     .AddNewtonsoftJson(opts =>
diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs
index b51d4ee76..4b2fe0c01 100644
--- a/src/FilterLists.Api/Startup.cs
+++ b/src/FilterLists.Api/Startup.cs
@@ -6,13 +6,17 @@
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace FilterLists.Api
 {
     [UsedImplicitly]
     public class Startup
     {
-        public Startup(IConfiguration configuration) => Configuration = configuration;
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
 
         private IConfiguration Configuration { get; }
 
@@ -25,18 +29,20 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         [UsedImplicitly]
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
                 app.UseDeveloperExceptionPage();
             else
                 app.UseExceptionHandler("/Error");
-            app.UseForwardedHeaders(new ForwardedHeadersOptions
-            {
-                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
-            });
+            app.UseForwardedHeaders(
+                new ForwardedHeadersOptions
+                {
+                    ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+                });
             app.UseStaticFiles();
-            app.UseMvc();
+            app.UseRouting();
+            app.UseEndpoints(endpoints => endpoints.MapControllers());
         }
     }
 }
\ No newline at end of file