diff --git a/src/Promitor.Agents.Core/Extensions/IApplicationBuilderExtensions.cs b/src/Promitor.Agents.Core/Extensions/IApplicationBuilderExtensions.cs
index 8b99d782f..e93954ace 100644
--- a/src/Promitor.Agents.Core/Extensions/IApplicationBuilderExtensions.cs
+++ b/src/Promitor.Agents.Core/Extensions/IApplicationBuilderExtensions.cs
@@ -35,6 +35,9 @@ public static IApplicationBuilder UsePrometheusMetrics(this IApplicationBuilder
                 prometheusOptions.MapPath = baseUriPath;
                 prometheusOptions.UseDefaultCollectors = true;
                 prometheusOptions.MetricPrefixName = "promitor_runtime_";
+#pragma warning disable CS0618
+                prometheusOptions.AddLegacyMetrics = true;
+#pragma warning restore CS0618
             });
 
             return app;
diff --git a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
index ab6154b47..42ea4f5d5 100644
--- a/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
+++ b/src/Promitor.Agents.Core/Promitor.Agents.Core.csproj
@@ -23,9 +23,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
-    <PackageReference Include="Prometheus.Client.AspNetCore" Version="4.6.0" />
-    <PackageReference Include="Prometheus.Client.DependencyInjection" Version="0.4.0" />
-    <PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.5.0" />
+    <PackageReference Include="Prometheus.Client" Version="5.1.0" />
+    <PackageReference Include="Prometheus.Client.AspNetCore" Version="4.8.0" />
+    <PackageReference Include="Prometheus.Client.HttpRequestDurations" Version="3.6.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Spectre.Console" Version="0.45.0" />
diff --git a/src/Promitor.Agents.ResourceDiscovery/Docs/Open-Api.xml b/src/Promitor.Agents.ResourceDiscovery/Docs/Open-Api.xml
index a82f944a1..985c5bf99 100644
--- a/src/Promitor.Agents.ResourceDiscovery/Docs/Open-Api.xml
+++ b/src/Promitor.Agents.ResourceDiscovery/Docs/Open-Api.xml
@@ -141,7 +141,7 @@
                 Initializes a new instance of the <see cref="T:Promitor.Agents.ResourceDiscovery.Graph.Repositories.CachedAzureResourceRepository" /> class.
             </summary>
         </member>
-        <member name="M:Promitor.Agents.ResourceDiscovery.Graph.RequestHandlers.AzureResourceGraphThrottlingRequestHandler.#ctor(Promitor.Core.Metrics.Prometheus.Collectors.Interfaces.ISystemMetricsPublisher,System.Collections.Generic.Dictionary{System.String,System.String},Microsoft.Extensions.Logging.ILogger)">
+        <member name="M:Promitor.Agents.ResourceDiscovery.Graph.RequestHandlers.AzureResourceGraphThrottlingRequestHandler.#ctor(Promitor.Core.Metrics.Interfaces.ISystemMetricsPublisher,System.Collections.Generic.Dictionary{System.String,System.String},Microsoft.Extensions.Logging.ILogger)">
             <summary>
                 Constructor
             </summary>
diff --git a/src/Promitor.Agents.Scraper/Docs/Open-Api.xml b/src/Promitor.Agents.Scraper/Docs/Open-Api.xml
index 07e405dee..5b452d9b0 100644
--- a/src/Promitor.Agents.Scraper/Docs/Open-Api.xml
+++ b/src/Promitor.Agents.Scraper/Docs/Open-Api.xml
@@ -4,7 +4,7 @@
         <name>Promitor.Agents.Scraper</name>
     </assembly>
     <members>
-        <member name="M:Promitor.Agents.Scraper.AzureMonitorClientFactory.CreateIfNotExists(Microsoft.Azure.Management.ResourceManager.Fluent.AzureEnvironment,System.String,System.String,Promitor.Core.Metrics.Sinks.MetricSinkWriter,Promitor.Core.Metrics.Prometheus.Collectors.Interfaces.IAzureScrapingSystemMetricsPublisher,Microsoft.Extensions.Caching.Memory.IMemoryCache,Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorIntegrationConfiguration},Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorLoggingConfiguration},Microsoft.Extensions.Logging.ILoggerFactory)">
+        <member name="M:Promitor.Agents.Scraper.AzureMonitorClientFactory.CreateIfNotExists(Microsoft.Azure.Management.ResourceManager.Fluent.AzureEnvironment,System.String,System.String,Promitor.Core.Metrics.Sinks.MetricSinkWriter,Promitor.Core.Metrics.Interfaces.IAzureScrapingSystemMetricsPublisher,Microsoft.Extensions.Caching.Memory.IMemoryCache,Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorIntegrationConfiguration},Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorLoggingConfiguration},Microsoft.Extensions.Logging.ILoggerFactory)">
             <summary>
             Provides an Azure Monitor client
             </summary>
@@ -248,7 +248,7 @@
             the same scraping schedule.
             </summary>
         </member>
-        <member name="M:Promitor.Agents.Scraper.Scheduling.ResourcesScrapingJob.#ctor(System.String,Promitor.Core.Scraping.Configuration.Model.MetricsDeclaration,Promitor.Agents.Scraper.Discovery.Interfaces.IResourceDiscoveryRepository,Promitor.Core.Metrics.Sinks.MetricSinkWriter,Promitor.Core.Scraping.Factories.MetricScraperFactory,Promitor.Agents.Scraper.AzureMonitorClientFactory,Promitor.Core.Metrics.Prometheus.Collectors.Interfaces.IAzureScrapingSystemMetricsPublisher,Microsoft.Extensions.Caching.Memory.IMemoryCache,Promitor.Agents.Scraper.Scheduling.IScrapingMutex,Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorIntegrationConfiguration},Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorLoggingConfiguration},Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.ILogger{Promitor.Agents.Scraper.Scheduling.ResourcesScrapingJob})">
+        <member name="M:Promitor.Agents.Scraper.Scheduling.ResourcesScrapingJob.#ctor(System.String,Promitor.Core.Scraping.Configuration.Model.MetricsDeclaration,Promitor.Agents.Scraper.Discovery.Interfaces.IResourceDiscoveryRepository,Promitor.Core.Metrics.Sinks.MetricSinkWriter,Promitor.Core.Scraping.Factories.MetricScraperFactory,Promitor.Agents.Scraper.AzureMonitorClientFactory,Promitor.Core.Metrics.Interfaces.IAzureScrapingSystemMetricsPublisher,Microsoft.Extensions.Caching.Memory.IMemoryCache,Promitor.Agents.Scraper.Scheduling.IScrapingMutex,Microsoft.Extensions.Configuration.IConfiguration,Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorIntegrationConfiguration},Microsoft.Extensions.Options.IOptions{Promitor.Integrations.AzureMonitor.Configuration.AzureMonitorLoggingConfiguration},Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Logging.ILogger{Promitor.Agents.Scraper.Scheduling.ResourcesScrapingJob})">
             <summary>
             Create a metrics scraping job for one or more resources, either enumerated specifically or
             identified via resource definition groups. All metrics included are expected to have
diff --git a/src/Promitor.Core/Promitor.Core.csproj b/src/Promitor.Core/Promitor.Core.csproj
index 6a9217051..5a1df4e29 100644
--- a/src/Promitor.Core/Promitor.Core.csproj
+++ b/src/Promitor.Core/Promitor.Core.csproj
@@ -21,7 +21,6 @@
     <PackageReference Include="Microsoft.Azure.Management.Monitor.Fluent" Version="1.38.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Prometheus.Client" Version="4.5.3" />
     <PackageReference Include="YamlDotNet" Version="12.0.1" />
   </ItemGroup>
 
diff --git a/src/Promitor.Integrations.Sinks.Prometheus/Extensions/IServiceCollectionExtensions.cs b/src/Promitor.Integrations.Sinks.Prometheus/Extensions/IServiceCollectionExtensions.cs
index e397bdf50..17288f0ce 100644
--- a/src/Promitor.Integrations.Sinks.Prometheus/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Promitor.Integrations.Sinks.Prometheus/Extensions/IServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Prometheus.Client;
 using Prometheus.Client.DependencyInjection;
 using Promitor.Core.Metrics.Interfaces;
 using Promitor.Integrations.Sinks.Prometheus.Collectors;
@@ -13,10 +14,10 @@ public static class IServiceCollectionExtensions
         /// </summary>
         public static IServiceCollection AddPrometheusSystemMetrics(this IServiceCollection services)
         {
-            services.AddMetricFactory();
+            services.AddMetricFactory(Metrics.DefaultCollectorRegistry);
             services.AddTransient<ISystemMetricsSink, PrometheusSystemMetricsSink>();
 
             return services;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj b/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj
index 815d50f3d..12d9e5b88 100644
--- a/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj
+++ b/src/Promitor.Integrations.Sinks.Prometheus/Promitor.Integrations.Sinks.Prometheus.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Prometheus.Client" Version="4.5.3" />
+    <PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.2.1" />
   </ItemGroup>
 
   <ItemGroup>