diff --git a/.vsts-pipelines/builds/ci-public-21.yml b/.vsts-pipelines/builds/ci-internal-21.yml
similarity index 84%
rename from .vsts-pipelines/builds/ci-public-21.yml
rename to .vsts-pipelines/builds/ci-internal-21.yml
index 7542fca220..1506ee3149 100644
--- a/.vsts-pipelines/builds/ci-public-21.yml
+++ b/.vsts-pipelines/builds/ci-internal-21.yml
@@ -1,13 +1,11 @@
 trigger:
 - release/2.2
 
-# See https://github.com/aspnet/BuildTools
 resources:
   repositories:
   - repository: buildtools
-    type: github
-    endpoint: DotNet-Bot GitHub Connection
-    name: aspnet/BuildTools
+    type: git
+    name: aspnet-BuildTools
     ref: refs/heads/release/2.2
 
 phases:
diff --git a/version.props b/version.props
index 023ad472eb..6fb4839c0d 100644
--- a/version.props
+++ b/version.props
@@ -9,7 +9,7 @@
     <AspNetCoreModuleVersionMinor>2</AspNetCoreModuleVersionMinor>
     <AspNetCoreModuleVersionRevision>$(DotNetPatchVersion)</AspNetCoreModuleVersionRevision>
     <VersionSuffix>rtm</VersionSuffix>
-    <VersionSuffix Condition="'$(BuildServerIIS21)' == 'true'">-ancm-oob</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildServerIIS21)' == 'true'">ancm-oob</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>