diff --git a/eng/Versions.props b/eng/Versions.props
index 5d018f8f891..d41c1c8c4d1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,7 +5,8 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
-    <PreReleaseVersionLabel>rc.1</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel Condition="'$(SuppressFinalPackageVersion)' != 'true'">rc.1</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel Condition="'$(PreReleaseVersionLabel)' == ''">preview.4</PreReleaseVersionLabel>
     <!--
       When running package validation as part of the build, we want to ensure we didn't break the API against the previous
       version of each package. The following property points to the package version that should be used as baseline.
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 40f08bffd40..0e3fd8671c2 100644
--- a/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj
+++ b/src/Aspire.Hosting.Azure.WebPubSub/Aspire.Hosting.Azure.WebPubSub.csproj
@@ -6,8 +6,6 @@
     <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. -->
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <!-- Disable package validation as this package hasn't shipped yet. -->
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Azure.WebPubSub/Directory.Build.props b/src/Aspire.Hosting.Azure.WebPubSub/Directory.Build.props
new file mode 100644
index 00000000000..a8b5ddbd965
--- /dev/null
+++ b/src/Aspire.Hosting.Azure.WebPubSub/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <!-- This needs to be set to true before importing parent Directory.Build.props -->
+     <!-- This library can't ship stable until Azure.Provisioning.WebPubSub ships stable. -->
+    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
\ No newline at end of file
diff --git a/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj b/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
index bc35cd8223e..63fdf597652 100644
--- a/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
+++ b/src/Aspire.Hosting.Elasticsearch/Aspire.Hosting.Elasticsearch.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>aspire integration hosting elasticsearch</PackageTags>
     <Description>Elasticsearch support for .NET Aspire.</Description>
     <PackageIconFullPath>$(SharedDir)Elastic_logo.png</PackageIconFullPath>
diff --git a/src/Aspire.Hosting.Elasticsearch/Directory.Build.props b/src/Aspire.Hosting.Elasticsearch/Directory.Build.props
new file mode 100644
index 00000000000..ca627658881
--- /dev/null
+++ b/src/Aspire.Hosting.Elasticsearch/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj b/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
index f2fcb5c76e7..66241918be5 100644
--- a/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
+++ b/src/Aspire.Hosting.Keycloak/Aspire.Hosting.Keycloak.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>aspire integration hosting keycloak</PackageTags>
     <Description>Keycloak support for .NET Aspire.</Description>
   </PropertyGroup>
diff --git a/src/Aspire.Hosting.Keycloak/Directory.Build.props b/src/Aspire.Hosting.Keycloak/Directory.Build.props
new file mode 100644
index 00000000000..ca627658881
--- /dev/null
+++ b/src/Aspire.Hosting.Keycloak/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj b/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj
index af0a2a6aae5..9dc56c3b4ea 100644
--- a/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj
+++ b/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <!-- This library can't ship stable until Azure.AI.OpenAI ships stable. -->
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>$(ComponentAzurePackageTags) ai openai</PackageTags>
     <Description>A client for Azure OpenAI that integrates with Aspire, including logging and telemetry.</Description>
     <PackageIconFullPath>$(SharedDir)AzureOpenAI_256x.png</PackageIconFullPath>
diff --git a/src/Components/Aspire.Azure.AI.OpenAI/Directory.Build.props b/src/Components/Aspire.Azure.AI.OpenAI/Directory.Build.props
new file mode 100644
index 00000000000..d82a0aa34a2
--- /dev/null
+++ b/src/Components/Aspire.Azure.AI.OpenAI/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <!-- This library can't ship stable until Azure.AI.OpenAI ships stable. -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Aspire.Elastic.Clients.Elasticsearch/Aspire.Elastic.Clients.Elasticsearch.csproj b/src/Components/Aspire.Elastic.Clients.Elasticsearch/Aspire.Elastic.Clients.Elasticsearch.csproj
index 18711fbf95a..1ff3baf611b 100644
--- a/src/Components/Aspire.Elastic.Clients.Elasticsearch/Aspire.Elastic.Clients.Elasticsearch.csproj
+++ b/src/Components/Aspire.Elastic.Clients.Elasticsearch/Aspire.Elastic.Clients.Elasticsearch.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>$(ComponentCommonPackageTags) Elasticsearch</PackageTags>
     <Description>A Elasticsearch client that integrates with Aspire, including health checks, logging, and telemetry.</Description>
     <PackageIconFullPath>$(SharedDir)Elastic_logo.png</PackageIconFullPath>
diff --git a/src/Components/Aspire.Elastic.Clients.Elasticsearch/Directory.Build.props b/src/Components/Aspire.Elastic.Clients.Elasticsearch/Directory.Build.props
new file mode 100644
index 00000000000..ca627658881
--- /dev/null
+++ b/src/Components/Aspire.Elastic.Clients.Elasticsearch/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Aspire.Keycloak.Authentication/Aspire.Keycloak.Authentication.csproj b/src/Components/Aspire.Keycloak.Authentication/Aspire.Keycloak.Authentication.csproj
index 7e4cae0311c..53903bb7846 100644
--- a/src/Components/Aspire.Keycloak.Authentication/Aspire.Keycloak.Authentication.csproj
+++ b/src/Components/Aspire.Keycloak.Authentication/Aspire.Keycloak.Authentication.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>$(ComponentCommonPackageTags) Keycloak</PackageTags>
     <Description>Configures Keycloak as the authentication provider for ASP.NET Core applications.</Description>
     <!-- Disable package validation as this package hasn't shipped yet. -->
diff --git a/src/Components/Aspire.Keycloak.Authentication/Directory.Build.props b/src/Components/Aspire.Keycloak.Authentication/Directory.Build.props
new file mode 100644
index 00000000000..ca627658881
--- /dev/null
+++ b/src/Components/Aspire.Keycloak.Authentication/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Aspire.Milvus.Client/Aspire.Milvus.Client.csproj b/src/Components/Aspire.Milvus.Client/Aspire.Milvus.Client.csproj
index 220fec74c68..b36f2662c7a 100644
--- a/src/Components/Aspire.Milvus.Client/Aspire.Milvus.Client.csproj
+++ b/src/Components/Aspire.Milvus.Client/Aspire.Milvus.Client.csproj
@@ -6,7 +6,6 @@
     <PackageTags>$(ComponentCommonPackageTags) milvus database vector search</PackageTags>
     <Description>A Milvus client that integrates with Aspire, including logging.</Description>
     <PackageIconFullPath>$(SharedDir)Milvus_256x.png</PackageIconFullPath>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <NoWarn>$(NoWarn);CS8002</NoWarn> <!-- Milvus.Client packages are not signed -->
     <!-- Disable package validation as this package hasn't shipped yet. -->
     <EnablePackageValidation>false</EnablePackageValidation>
diff --git a/src/Components/Aspire.Milvus.Client/Directory.Build.props b/src/Components/Aspire.Milvus.Client/Directory.Build.props
new file mode 100644
index 00000000000..ca627658881
--- /dev/null
+++ b/src/Components/Aspire.Milvus.Client/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj b/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj
index 7a6856bcca5..fd8747d8acf 100644
--- a/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj
+++ b/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
     <IsPackable>true</IsPackable>
-    <!-- This library can't ship stable until OpenAI ships stable. -->
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <PackageTags>$(ComponentCommonPackageTags) ai openai</PackageTags>
     <Description>A client for OpenAI that integrates with Aspire, including metrics and telemetry.</Description>
     <NoWarn>$(NoWarn);SYSLIB1100;SYSLIB1101</NoWarn>
diff --git a/src/Components/Aspire.OpenAI/Directory.Build.props b/src/Components/Aspire.OpenAI/Directory.Build.props
new file mode 100644
index 00000000000..185c8289a8f
--- /dev/null
+++ b/src/Components/Aspire.OpenAI/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+      <!-- This needs to be set to true before importing parent Directory.Build.props -->
+      <!-- This library can't ship stable until OpenAI ships stable. -->
+      <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    </PropertyGroup>
+  
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  </Project>
\ No newline at end of file
diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets
index fcbb56191d1..a1a5f0b0b00 100644
--- a/src/Components/Directory.Build.targets
+++ b/src/Components/Directory.Build.targets
@@ -27,6 +27,12 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="ValidatePreReleaseLabelIsCorrectForPreviewPackages"
+          AfterTargets="Pack"
+          Condition="'$(OfficialBuildId)' != '' and '$(SuppressFinalPackageVersion)' == 'true' and !$(PreReleaseVersionLabel.StartsWith('preview'))">
+    <Error Text="The PreReleaseLabel for package '$(MSBuildProjectName)' must start with 'preview' as it has the SuppressFinalPackageVersion flag set. Current label is '$(PreReleaseVersionLabel)'" />
+  </Target>
+
   <!--
   Logic for generating and comparing the ConfigurationSchema.json file
   -->