diff --git a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
index 4f7745f38..7da38b732 100644
--- a/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
+++ b/src/FilterLists.Agent/Extensions/ServiceCollectionExtensions.cs
@@ -20,7 +20,7 @@ public static void RegisterAgentServices(this IServiceCollection services)
             services.AddConfiguration();
             services.AddLoggingCustom();
             services.AddTransient<Parser>();
-            services.AddMediatR(typeof(Program).Assembly);
+            services.AddMediatR(AppDomain.CurrentDomain.GetAssemblies());
             services.AddAgentHttpClient();
             services.AddSingleton<IFilterListsApiClient, FilterListsApiClient>();
             services.AddSingleton<IAgentGitHubClient, AgentGitHubClient>();
@@ -37,12 +37,15 @@ private static void AddConfiguration(this IServiceCollection services)
                 .AddJsonFile("appsettings.Development.json", true, true)
 #endif
                 .Build();
-            services.Configure<ApplicationInsightsSettings>(
-                config.GetSection(nameof(ApplicationInsightsSettings).RemoveSettingsSuffix()));
-            services.Configure<ConnectionStringsSettings>(
-                config.GetSection(nameof(ConnectionStringsSettings).RemoveSettingsSuffix()));
-            services.Configure<GitHubSettings>(
-                config.GetSection(nameof(GitHubSettings).RemoveSettingsSuffix()));
+            services.ConfigureCustom<ApplicationInsightsSettings>(config);
+            services.ConfigureCustom<ConnectionStringsSettings>(config);
+            services.ConfigureCustom<GitHubSettings>(config);
+        }
+
+        private static void ConfigureCustom<TSettings>(this IServiceCollection services, IConfiguration configuration)
+            where TSettings : class
+        {
+            services.Configure<TSettings>(configuration.GetSection(typeof(TSettings).Name.RemoveSettingsSuffix()));
         }
 
         private static string RemoveSettingsSuffix(this string section)