diff --git a/eng/pipelines/templates/jobs/mgmt-release.yml b/eng/pipelines/templates/jobs/mgmt-release.yml
index 180d914069fb..6fa22b788584 100644
--- a/eng/pipelines/templates/jobs/mgmt-release.yml
+++ b/eng/pipelines/templates/jobs/mgmt-release.yml
@@ -39,21 +39,11 @@ jobs:
 
       - ${{ if and(eq(parameters.ShouldPublishToNuget, 'true'), eq(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-net')) }}:
 
-        - task: Powershell@2
-          displayName: 'Verify Package Tags and Create Git Releases'
-          inputs:
-            filePath: ${{ parameters.BuildToolsPath }}/scripts/create-tags-and-git-release.ps1
-            arguments: >
-              -artifactLocation '$(PIPELINE.WORKSPACE)/packages'
-              -workingDirectory $(System.DefaultWorkingDirectory)
-              -packageRepository 'Nuget'
-              -releaseSha '$(Build.SourceVersion)'
-              -repoOwner 'Azure'
-              -repoName 'azure-sdk-for-net'
-            pwsh: true
-          env:
-            GH_TOKEN: $(azuresdk-github-pat)
-          condition: and(succeeded(), ne(variables['SkipCreateTagAndGitRelease'], 'true'))
+        - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
+          parameters:
+            ArtifactLocation: '$(PIPELINE.WORKSPACE)/packages'
+            PackageRepository: Nuget
+            ReleaseSha: $(Build.SourceVersion)
 
         - template: pipelines/steps/publish-symbols.yml@azure-sdk-build-tools
           displayName: 'Upload Symbols'
diff --git a/eng/pipelines/templates/stages/archetype-net-release.yml b/eng/pipelines/templates/stages/archetype-net-release.yml
index 7be7e0de1634..4465fb157c0e 100644
--- a/eng/pipelines/templates/stages/archetype-net-release.yml
+++ b/eng/pipelines/templates/stages/archetype-net-release.yml
@@ -105,7 +105,6 @@ stages:
                             ArtifactLocation: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.name}}
                             PackageRepository: Nuget
                             ReleaseSha: $(Build.SourceVersion)
-                            RepoId: Azure/azure-sdk-for-net
 
             - ${{if ne(artifact.skipPublishPackage, 'true')}}:
               - deployment: PublishPackage