diff --git a/build/common.props b/build/common.props
index fcf40a899f..464cf34bdb 100644
--- a/build/common.props
+++ b/build/common.props
@@ -11,14 +11,11 @@
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <OriginalVersionSuffix>$(VersionSuffix)</OriginalVersionSuffix>
-
-    <!-- Don't mess with VersionSuffix, we need to use it unmodified in other targets -->
-    <BuildVersionSuffix>$(VersionSuffix)</BuildVersionSuffix>
-    <BuildVersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</BuildVersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</BuildVersionSuffix>
 
     <!-- Pin versions to work around CLI bug -->
-    <AspNetCoreVersion Condition="'$(BUILD_PACKAGE_CACHE)' == 'true'">2.0.0-$(BuildVersionSuffix)</AspNetCoreVersion>
-    <AspNetCoreIdentityServiceVersion Condition="'$(BUILD_PACKAGE_CACHE)' == 'true'">1.0.0-$(BuildVersionSuffix)</AspNetCoreIdentityServiceVersion>
+    <AspNetCoreVersion Condition="'$(BUILD_PACKAGE_CACHE)' == 'true'">2.0.0-$(VersionSuffix)</AspNetCoreVersion>
+    <AspNetCoreIdentityServiceVersion Condition="'$(BUILD_PACKAGE_CACHE)' == 'true'">1.0.0-$(VersionSuffix)</AspNetCoreIdentityServiceVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/build/repo.targets b/build/repo.targets
index ac13314b1c..9888724625 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -141,8 +141,8 @@
         <NoTimestampSuffix Condition="'$(TIMESTAMP_FREE_VERSION)' != ''">$(TIMESTAMP_FREE_VERSION)</NoTimestampSuffix>
         <NoTimestampSuffix Condition="'$(NoTimestampSuffix)' == ''">final</NoTimestampSuffix>
 
-        <NoTimestampVersion>$(VersionPrefix)-$(VersionSuffix)-$(NoTimestampSuffix)</NoTimestampVersion>
-        <TimestampVersion>$(VersionPrefix)-$(VersionSuffix)-$(BuildNumber)</TimestampVersion>
+        <NoTimestampVersion>$(VersionPrefix)-$(OriginalVersionSuffix)-$(NoTimestampSuffix)</NoTimestampVersion>
+        <TimestampVersion>$(VersionPrefix)-$(OriginalVersionSuffix)-$(BuildNumber)</TimestampVersion>
 
         <NoTimestampSource>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages-NoTimeStamp</NoTimestampSource>
         <TimestampSource>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages</TimestampSource>