diff --git a/src/Aspire.Hosting.Azure.Redis/CompatibilitySuppressions.xml b/src/Aspire.Hosting.Azure.Redis/CompatibilitySuppressions.xml
deleted file mode 100644
index 46d82d4e1ef..00000000000
--- a/src/Aspire.Hosting.Azure.Redis/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.Azure.AzureRedisEnterpriseResource</Target>
-    <Left>lib/net8.0/Aspire.Hosting.Azure.Redis.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.Azure.Redis.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.AzureRedisEnterpriseExtensions</Target>
-    <Left>lib/net8.0/Aspire.Hosting.Azure.Redis.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.Azure.Redis.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Aspire.Hosting/CompatibilitySuppressions.xml b/src/Aspire.Hosting/CompatibilitySuppressions.xml
index f953a02bdcb..f1648ac2290 100644
--- a/src/Aspire.Hosting/CompatibilitySuppressions.xml
+++ b/src/Aspire.Hosting/CompatibilitySuppressions.xml
@@ -1,72 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.ApplicationModel.DeploymentImageTagCallbackAnnotation</Target>
-    <Left>lib/net8.0/Aspire.Hosting.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.ApplicationModel.DeploymentImageTagCallbackAnnotationContext</Target>
-    <Left>lib/net8.0/Aspire.Hosting.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.Publishing.ContainerBuildOptions</Target>
-    <Left>lib/net8.0/Aspire.Hosting.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Aspire.Hosting.Publishing.IResourceContainerImageBuilder</Target>
-    <Left>lib/net8.0/Aspire.Hosting.dll</Left>
-    <Right>lib/net8.0/Aspire.Hosting.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Aspire.Hosting.ApplicationModel.ResourceExtensions.WithDeploymentImageTag``1(Aspire.Hosting.ApplicationModel.IResourceBuilder{``0},System.Func{Aspire.Hosting.ApplicationModel.DeploymentImageTagCallbackAnnotationContext,System.String})</Target>
+    <Target>M:Aspire.Hosting.ParameterProcessor.#ctor(Aspire.Hosting.ApplicationModel.ResourceNotificationService,Aspire.Hosting.ApplicationModel.ResourceLoggerService,Aspire.Hosting.IInteractionService,Microsoft.Extensions.Logging.ILogger{Aspire.Hosting.ParameterProcessor},Aspire.Hosting.DistributedApplicationExecutionContext,Aspire.Hosting.Pipelines.IDeploymentStateManager)</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Aspire.Hosting.ApplicationModel.ResourceExtensions.WithDeploymentImageTag``1(Aspire.Hosting.ApplicationModel.IResourceBuilder{``0},System.Func{Aspire.Hosting.ApplicationModel.DeploymentImageTagCallbackAnnotationContext,System.Threading.Tasks.Task{System.String}})</Target>
+    <Target>M:Aspire.Hosting.Publishing.IContainerRuntime.BuildImageAsync(System.String,System.String,Aspire.Hosting.Publishing.ContainerImageBuildOptions,System.Collections.Generic.Dictionary{System.String,System.String},System.Collections.Generic.Dictionary{System.String,System.String},System.String,System.Threading.CancellationToken)</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Aspire.Hosting.ParameterProcessor.#ctor(Aspire.Hosting.ApplicationModel.ResourceNotificationService,Aspire.Hosting.ApplicationModel.ResourceLoggerService,Aspire.Hosting.IInteractionService,Microsoft.Extensions.Logging.ILogger{Aspire.Hosting.ParameterProcessor},Aspire.Hosting.DistributedApplicationExecutionContext,Aspire.Hosting.Pipelines.IDeploymentStateManager)</Target>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Aspire.Hosting.Pipelines.IDeploymentStateManager.DeleteSectionAsync(Aspire.Hosting.Pipelines.DeploymentStateSection,System.Threading.CancellationToken)</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Aspire.Hosting.Pipelines.IDeploymentStateManager.DeleteSectionAsync(Aspire.Hosting.Pipelines.DeploymentStateSection,System.Threading.CancellationToken)</Target>
+    <Target>M:Aspire.Hosting.Pipelines.IPipelineActivityReporter.CompletePublishAsync(Aspire.Hosting.Pipelines.PublishCompletionOptions,System.Threading.CancellationToken)</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Aspire.Hosting.Pipelines.IPipelineActivityReporter.CompletePublishAsync(Aspire.Hosting.Pipelines.PublishCompletionOptions,System.Threading.CancellationToken)</Target>
+    <Target>M:Aspire.Hosting.Publishing.IContainerRuntime.BuildImageAsync(System.String,System.String,Aspire.Hosting.Publishing.ContainerImageBuildOptions,System.Collections.Generic.Dictionary{System.String,System.String},System.Collections.Generic.Dictionary{System.String,Aspire.Hosting.Publishing.BuildImageSecretValue},System.String,System.Threading.CancellationToken)</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Aspire.Hosting.IDeveloperCertificateService.UseForHttps</Target>
+    <Target>P:Aspire.Hosting.IUserSecretsManager.IsAvailable</Target>
     <Left>lib/net8.0/Aspire.Hosting.dll</Left>
     <Right>lib/net8.0/Aspire.Hosting.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ccdef101f16..94f6356c316 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <!-- Enabling this rule will cause build failures on undocumented public APIs. -->
     <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">true</EnablePackageValidation>
-    <PackageValidationBaselineVersion Condition="'$(EnablePackageValidation)' == 'true' and '$(PackageValidationBaselineVersion)' == ''">13.0.2</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion Condition="'$(EnablePackageValidation)' == 'true' and '$(PackageValidationBaselineVersion)' == ''">13.1.2</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup>