diff --git a/src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj b/src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj
index 28eaa272b7..24258c9354 100644
--- a/src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj
+++ b/src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj
@@ -5,7 +5,7 @@
     <IsPackable>true</IsPackable>
     <!-- This library needs more bake time until it can ship stable. -->
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
-    <PackageTags>aspire hosting aws</PackageTags>
+    <PackageTags>aspire integration hosting aws</PackageTags>
     <Description>Add support for provisioning AWS application resources and configuring the AWS SDK for .NET.</Description>
     <!-- This package hasn't shipped stable, so package validation runs against previously shipped version of it. -->
     <PackageValidationBaselineVersion>8.0.1-preview.8.24267.1</PackageValidationBaselineVersion>
diff --git a/src/Aspire.Hosting.Azure.AppConfiguration/Aspire.Hosting.Azure.AppConfiguration.csproj b/src/Aspire.Hosting.Azure.AppConfiguration/Aspire.Hosting.Azure.AppConfiguration.csproj
index 2a51aa2622..7865256f5d 100644
--- a/src/Aspire.Hosting.Azure.AppConfiguration/Aspire.Hosting.Azure.AppConfiguration.csproj
+++ b/src/Aspire.Hosting.Azure.AppConfiguration/Aspire.Hosting.Azure.AppConfiguration.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure AppConfiguration resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureAppConfig_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.ApplicationInsights/Aspire.Hosting.Azure.ApplicationInsights.csproj b/src/Aspire.Hosting.Azure.ApplicationInsights/Aspire.Hosting.Azure.ApplicationInsights.csproj
index c2e9317001..59b6fca1ab 100644
--- a/src/Aspire.Hosting.Azure.ApplicationInsights/Aspire.Hosting.Azure.ApplicationInsights.csproj
+++ b/src/Aspire.Hosting.Azure.ApplicationInsights/Aspire.Hosting.Azure.ApplicationInsights.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Application Insights resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureAppInsights_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.CognitiveServices/Aspire.Hosting.Azure.CognitiveServices.csproj b/src/Aspire.Hosting.Azure.CognitiveServices/Aspire.Hosting.Azure.CognitiveServices.csproj
index c0abd55dac..49be89da3d 100644
--- a/src/Aspire.Hosting.Azure.CognitiveServices/Aspire.Hosting.Azure.CognitiveServices.csproj
+++ b/src/Aspire.Hosting.Azure.CognitiveServices/Aspire.Hosting.Azure.CognitiveServices.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure openai ai cognitiveservices cognitive services</PackageTags>
+    <PackageTags>aspire integration hosting azure openai ai cognitiveservices cognitive services</PackageTags>
     <Description>Azure OpenAI resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureOpenAI_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj b/src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj
index a699bf91f0..d7e4d19c12 100644
--- a/src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj
+++ b/src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Cosmos DB resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureCosmosDB_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj b/src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj
index de47e7d9b1..0e4f875014 100644
--- a/src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj
+++ b/src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure eventhubs</PackageTags>
+    <PackageTags>aspire integration hosting azure eventhubs</PackageTags>
     <Description>Azure Event Hubs resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureEventHubs_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.KeyVault/Aspire.Hosting.Azure.KeyVault.csproj b/src/Aspire.Hosting.Azure.KeyVault/Aspire.Hosting.Azure.KeyVault.csproj
index fb43f31ac4..3d177195da 100644
--- a/src/Aspire.Hosting.Azure.KeyVault/Aspire.Hosting.Azure.KeyVault.csproj
+++ b/src/Aspire.Hosting.Azure.KeyVault/Aspire.Hosting.Azure.KeyVault.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureKeyVault_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.OperationalInsights/Aspire.Hosting.Azure.OperationalInsights.csproj b/src/Aspire.Hosting.Azure.OperationalInsights/Aspire.Hosting.Azure.OperationalInsights.csproj
index 560047bba3..cbf43fbef7 100644
--- a/src/Aspire.Hosting.Azure.OperationalInsights/Aspire.Hosting.Azure.OperationalInsights.csproj
+++ b/src/Aspire.Hosting.Azure.OperationalInsights/Aspire.Hosting.Azure.OperationalInsights.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Log Anlytics resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureLogAnalytics_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.PostgreSQL/Aspire.Hosting.Azure.PostgreSQL.csproj b/src/Aspire.Hosting.Azure.PostgreSQL/Aspire.Hosting.Azure.PostgreSQL.csproj
index 3b509b641a..f9ac14c649 100644
--- a/src/Aspire.Hosting.Azure.PostgreSQL/Aspire.Hosting.Azure.PostgreSQL.csproj
+++ b/src/Aspire.Hosting.Azure.PostgreSQL/Aspire.Hosting.Azure.PostgreSQL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure PostgreSql Flexible Server resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzurePostgreSQL_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.Redis/Aspire.Hosting.Azure.Redis.csproj b/src/Aspire.Hosting.Azure.Redis/Aspire.Hosting.Azure.Redis.csproj
index db0f5e1e1b..94f7ab0e49 100644
--- a/src/Aspire.Hosting.Azure.Redis/Aspire.Hosting.Azure.Redis.csproj
+++ b/src/Aspire.Hosting.Azure.Redis/Aspire.Hosting.Azure.Redis.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Redis resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureCacheRedis_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.Search/Aspire.Hosting.Azure.Search.csproj b/src/Aspire.Hosting.Azure.Search/Aspire.Hosting.Azure.Search.csproj
index 0244eaf899..498cd8852d 100644
--- a/src/Aspire.Hosting.Azure.Search/Aspire.Hosting.Azure.Search.csproj
+++ b/src/Aspire.Hosting.Azure.Search/Aspire.Hosting.Azure.Search.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure AI Search resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureSearch_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj b/src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj
index 9bd97f7152..7eba84417f 100644
--- a/src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj
+++ b/src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Service Bus resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureServiceBus_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.SignalR/Aspire.Hosting.Azure.SignalR.csproj b/src/Aspire.Hosting.Azure.SignalR/Aspire.Hosting.Azure.SignalR.csproj
index f8b98c4d45..6316a01a6f 100644
--- a/src/Aspire.Hosting.Azure.SignalR/Aspire.Hosting.Azure.SignalR.csproj
+++ b/src/Aspire.Hosting.Azure.SignalR/Aspire.Hosting.Azure.SignalR.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure SignalR resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureSignalR_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.Sql/Aspire.Hosting.Azure.Sql.csproj b/src/Aspire.Hosting.Azure.Sql/Aspire.Hosting.Azure.Sql.csproj
index 27da84f9b8..de9306903f 100644
--- a/src/Aspire.Hosting.Azure.Sql/Aspire.Hosting.Azure.Sql.csproj
+++ b/src/Aspire.Hosting.Azure.Sql/Aspire.Hosting.Azure.Sql.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure SQL Database resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureSqlServer_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.Storage/Aspire.Hosting.Azure.Storage.csproj b/src/Aspire.Hosting.Azure.Storage/Aspire.Hosting.Azure.Storage.csproj
index f8eed3a2c0..0db4b47e17 100644
--- a/src/Aspire.Hosting.Azure.Storage/Aspire.Hosting.Azure.Storage.csproj
+++ b/src/Aspire.Hosting.Azure.Storage/Aspire.Hosting.Azure.Storage.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure</PackageTags>
+    <PackageTags>aspire integration hosting azure</PackageTags>
     <Description>Azure Storage resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureStorageContainer_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj b/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj
index 85a9b16e57..bc82ea34a1 100644
--- a/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj
+++ b/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting azure webpubsub pubsub websocket</PackageTags>
+    <PackageTags>aspire integration hosting azure webpubsub pubsub websocket</PackageTags>
     <Description>Azure WebPubSub resource types for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)AzureWebPubSub_256x.png</PackageIconFullPath>
     <!-- This library can't ship stable until Azure.Provisioning.WebPubSub ships stable. -->
diff --git a/src/Aspire.Hosting.Dapr/Aspire.Hosting.Dapr.csproj b/src/Aspire.Hosting.Dapr/Aspire.Hosting.Dapr.csproj
index b406de7712..f90456f637 100644
--- a/src/Aspire.Hosting.Dapr/Aspire.Hosting.Dapr.csproj
+++ b/src/Aspire.Hosting.Dapr/Aspire.Hosting.Dapr.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting dapr</PackageTags>
+    <PackageTags>aspire integration hosting dapr</PackageTags>
     <Description>Dapr support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj b/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
index 92f9265a26..428cb5c5d9 100644
--- a/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
+++ b/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
-    <PackageTags>aspire hosting elasticsearch</PackageTags>
+    <PackageTags>aspire integration hosting elasticsearch</PackageTags>
     <Description>Elasticsearch support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)Elastic_logo.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Garnet/Aspire.Hosting.Garnet.csproj b/src/Aspire.Hosting.Garnet/Aspire.Hosting.Garnet.csproj
index 3cddd2f16e..79634227af 100644
--- a/src/Aspire.Hosting.Garnet/Aspire.Hosting.Garnet.csproj
+++ b/src/Aspire.Hosting.Garnet/Aspire.Hosting.Garnet.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting garnet</PackageTags>
+    <PackageTags>aspire integration hosting garnet</PackageTags>
     <Description>Garnet® support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)garnet-cube-red_white-rgb.png</PackageIconFullPath>
     <!-- Disable package validation as this package hasn't shipped yet. -->
diff --git a/src/Aspire.Hosting.Kafka/Aspire.Hosting.Kafka.csproj b/src/Aspire.Hosting.Kafka/Aspire.Hosting.Kafka.csproj
index 2c76c40a48..7ea892a64e 100644
--- a/src/Aspire.Hosting.Kafka/Aspire.Hosting.Kafka.csproj
+++ b/src/Aspire.Hosting.Kafka/Aspire.Hosting.Kafka.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting kafka</PackageTags>
+    <PackageTags>aspire integration hosting kafka</PackageTags>
     <Description>Kafka support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj b/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
index 923fe66d01..5caf545357 100644
--- a/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
+++ b/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
-    <PackageTags>aspire hosting keycloak</PackageTags>
+    <PackageTags>aspire integration hosting keycloak</PackageTags>
     <Description>Keycloak support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj b/src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj
index 7943dedde6..fb78cd9bad 100644
--- a/src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj
+++ b/src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting milvus database vector search</PackageTags>
+    <PackageTags>aspire integration hosting milvus database vector search</PackageTags>
     <Description>Milvus vector database support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)Milvus_256x.png</PackageIconFullPath>
     <!-- Disable package validation as this package hasn't shipped yet. -->
diff --git a/src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj b/src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj
index 66c374e26f..c3482d8812 100644
--- a/src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj
+++ b/src/Aspire.Hosting.MongoDB/Aspire.Hosting.MongoDB.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting MongoDB</PackageTags>
+    <PackageTags>aspire integration hosting MongoDB</PackageTags>
     <PackageIconFullPath>$(SharedDir)MongoDB_300px.png</PackageIconFullPath>
     <Description>MongoDB support for .NET Aspire.</Description>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj b/src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj
index b21f1c04ff..5c466beddb 100644
--- a/src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj
+++ b/src/Aspire.Hosting.MySql/Aspire.Hosting.MySql.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting MySQL</PackageTags>
+    <PackageTags>aspire integration hosting MySQL</PackageTags>
     <Description>MySQL support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)MySQL_logo.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj b/src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj
index 33fa407b67..ff44573742 100644
--- a/src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj
+++ b/src/Aspire.Hosting.Nats/Aspire.Hosting.Nats.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting NATS</PackageTags>
+    <PackageTags>aspire integration hosting NATS</PackageTags>
     <Description>NATS support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)nats-icon.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj b/src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj
index fceb6876fb..3221a046a6 100644
--- a/src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj
+++ b/src/Aspire.Hosting.NodeJs/Aspire.Hosting.NodeJs.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting Node Nodejs</PackageTags>
+    <PackageTags>aspire integration hosting Node Nodejs</PackageTags>
     <Description>Node.js support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj b/src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj
index 126fbbccb4..ed736bba1e 100644
--- a/src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj
+++ b/src/Aspire.Hosting.Oracle/Aspire.Hosting.Oracle.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting oracle sql</PackageTags>
+    <PackageTags>aspire integration hosting oracle sql</PackageTags>
     <Description>Oracle Database support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj b/src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj
index 9587722f80..065520904f 100644
--- a/src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj
+++ b/src/Aspire.Hosting.Orleans/Aspire.Hosting.Orleans.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting orleans</PackageTags>
+    <PackageTags>aspire integration hosting orleans</PackageTags>
     <Description>Orleans support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj b/src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj
index 1bbdf16ace..c85a73b11e 100644
--- a/src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj
+++ b/src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting postgresql postgres npgsql sql</PackageTags>
+    <PackageTags>aspire integration hosting postgresql postgres npgsql sql</PackageTags>
     <Description>PostgreSQL® support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)PostgreSQL_logo.3colors.540x557.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Python/Aspire.Hosting.Python.csproj b/src/Aspire.Hosting.Python/Aspire.Hosting.Python.csproj
index efe3c63c76..741e5c398c 100644
--- a/src/Aspire.Hosting.Python/Aspire.Hosting.Python.csproj
+++ b/src/Aspire.Hosting.Python/Aspire.Hosting.Python.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting python</PackageTags>
+    <PackageTags>aspire integration hosting python</PackageTags>
     <Description>Python support for .NET Aspire.</Description>
     <MinCodeCoverage>80</MinCodeCoverage>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Qdrant/Aspire.Hosting.Qdrant.csproj b/src/Aspire.Hosting.Qdrant/Aspire.Hosting.Qdrant.csproj
index 6174d0f289..b9b8dd684e 100644
--- a/src/Aspire.Hosting.Qdrant/Aspire.Hosting.Qdrant.csproj
+++ b/src/Aspire.Hosting.Qdrant/Aspire.Hosting.Qdrant.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting qdrant</PackageTags>
+    <PackageTags>aspire integration hosting qdrant</PackageTags>
     <Description>Qdrant vector database support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)QdrantLogo_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.RabbitMQ/Aspire.Hosting.RabbitMQ.csproj b/src/Aspire.Hosting.RabbitMQ/Aspire.Hosting.RabbitMQ.csproj
index a8c1674931..600121017e 100644
--- a/src/Aspire.Hosting.RabbitMQ/Aspire.Hosting.RabbitMQ.csproj
+++ b/src/Aspire.Hosting.RabbitMQ/Aspire.Hosting.RabbitMQ.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting rabbitmq</PackageTags>
+    <PackageTags>aspire integration hosting rabbitmq</PackageTags>
     <Description>RabbitMQ support for .NET Aspire.</Description>
   </PropertyGroup>
 
diff --git a/src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj b/src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj
index 8a461c4fec..f9a4bab88c 100644
--- a/src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj
+++ b/src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting redis</PackageTags>
+    <PackageTags>aspire integration hosting redis</PackageTags>
     <Description>Redis® support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)redis-cube-red_white-rgb.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Seq/Aspire.Hosting.Seq.csproj b/src/Aspire.Hosting.Seq/Aspire.Hosting.Seq.csproj
index 1a9311b2c9..a91f570251 100644
--- a/src/Aspire.Hosting.Seq/Aspire.Hosting.Seq.csproj
+++ b/src/Aspire.Hosting.Seq/Aspire.Hosting.Seq.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting Seq</PackageTags>
+    <PackageTags>aspire integration hosting Seq</PackageTags>
     <Description>Seq support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)Seq_logo.275x147.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.SqlServer/Aspire.Hosting.SqlServer.csproj b/src/Aspire.Hosting.SqlServer/Aspire.Hosting.SqlServer.csproj
index baed5e5c88..883aed4995 100644
--- a/src/Aspire.Hosting.SqlServer/Aspire.Hosting.SqlServer.csproj
+++ b/src/Aspire.Hosting.SqlServer/Aspire.Hosting.SqlServer.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting sqlserver sql</PackageTags>
+    <PackageTags>aspire integration hosting sqlserver sql</PackageTags>
     <Description>Microsoft SQL Server support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)SQL_256x.png</PackageIconFullPath>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Valkey/Aspire.Hosting.Valkey.csproj b/src/Aspire.Hosting.Valkey/Aspire.Hosting.Valkey.csproj
index 347853cf70..94008c4dd6 100644
--- a/src/Aspire.Hosting.Valkey/Aspire.Hosting.Valkey.csproj
+++ b/src/Aspire.Hosting.Valkey/Aspire.Hosting.Valkey.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageTags>aspire hosting valkey</PackageTags>
+    <PackageTags>aspire integration hosting valkey</PackageTags>
     <Description>Valkey® support for .NET Aspire.</Description>
     <!-- Disable package validation as this package hasn't shipped yet. -->
     <EnablePackageValidation>false</EnablePackageValidation>
diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props
index 4d572913c1..ef12505bf7 100644
--- a/src/Components/Directory.Build.props
+++ b/src/Components/Directory.Build.props
@@ -6,7 +6,7 @@
     <IsAotCompatible>true</IsAotCompatible>
     <EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
 
-    <ComponentCommonPackageTags>aspire component cloud</ComponentCommonPackageTags>
+    <ComponentCommonPackageTags>aspire integration client component cloud</ComponentCommonPackageTags>
     <ComponentCachePackageTags>$(ComponentCommonPackageTags) cache caching</ComponentCachePackageTags>
     <ComponentDatabasePackageTags>$(ComponentCommonPackageTags) data database</ComponentDatabasePackageTags>
     <ComponentEfCorePackageTags>$(ComponentDatabasePackageTags) ef efcore entityframework entityframeworkcore entity-framework-core o/rm</ComponentEfCorePackageTags>