diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml
index add04a92a..5b2a5b40c 100644
--- a/eng/pipelines/templates/stages/archetype-cpp-release.yml
+++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml
@@ -48,6 +48,8 @@ stages:
               displayName: Publish Docs to GitHub pages
               condition: ne(variables['Skip.PublishDocs'], 'true')
               environment: githubio
+              # Release tag must exist for link substitution to work
+              dependsOn: TagRepository
 
               pool:
                 name: azsdk-pool-mms-win-2019-general
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index dd0b54c33..ee54b3d20 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -59,7 +59,7 @@ function Get-cpp-PackageInfoFromPackageFile($pkg, $workingDirectory)
 function Publish-cpp-GithubIODocs ($DocLocation, $PublicArtifactLocation)
 {
   $packageInfo = (Get-Content (Join-Path $DocLocation 'package-info.json') | ConvertFrom-Json)
-  $releaseTag = RetrieveReleaseTag "CPP" $PublicArtifactLocation
+  $releaseTag = RetrieveReleaseTag $PublicArtifactLocation
   Upload-Blobs -DocDir $DocLocation -PkgName $packageInfo.name -DocVersion $packageInfo.version -ReleaseTag $releaseTag
 }