diff --git a/common/packaging.props b/common/packaging.props
index 98229f46..86a42117 100644
--- a/common/packaging.props
+++ b/common/packaging.props
@@ -14,5 +14,6 @@
     <PackageSubFolder>\$(CurrentFullPath.Substring($(PackageSourceRootFull.Length)))\</PackageSubFolder>
 
     <NpmVersionSuffix>-preview</NpmVersionSuffix>
+    <CINeedsCustomVersion Condition=" '$(YAMATO_JOB_ID)' != '' ">true</CINeedsCustomVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/common/packaging.targets b/common/packaging.targets
index f9c05485..a651f19e 100644
--- a/common/packaging.targets
+++ b/common/packaging.targets
@@ -57,7 +57,7 @@
 
     <PropertyGroup>
       <NeedsSuffix Condition="'$(PublicRelease)' != 'true' and '$(NpmVersionSuffix)' != '' and !$(NuGetPackageVersion.Contains('$(NpmVersionSuffix)'))">true</NeedsSuffix>
-      <NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(YAMATO_JOB_ID)' != ''">true</NeedsCustomVersion>
+      <NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(CINeedsCustomVersion)' == 'true' ">true</NeedsCustomVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)$(FileVersion.Substring($(FileVersion.LastIndexOf('.'))))</NpmVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>
@@ -164,7 +164,7 @@
 
     <PropertyGroup>
       <NeedsSuffix Condition="'$(PublicRelease)' != 'true' and '$(NpmVersionSuffix)' != '' and !$(NuGetPackageVersion.Contains('$(NpmVersionSuffix)'))">true</NeedsSuffix>
-      <NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(YAMATO_JOB_ID)' != ''">true</NeedsCustomVersion>
+      <NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(CINeedsCustomVersion)' == 'true' ">true</NeedsCustomVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)$(FileVersion.Substring($(FileVersion.LastIndexOf('.'))))</NpmVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
       <NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>