diff --git a/.azure-pipelines/nightly.yml b/.azure-pipelines/nightly.yml
index d083d6d8..4329eb7a 100644
--- a/.azure-pipelines/nightly.yml
+++ b/.azure-pipelines/nightly.yml
@@ -19,9 +19,10 @@ resources:
     - repository: self
       type: git
       ref: refs/heads/main
-    - repository: MicroBuildTemplate
+    - repository: CustomPipelineTemplates
       type: git
       name: 1ESPipelineTemplates/MicroBuildTemplate
+      ref: refs/tags/release
 trigger: none
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@CustomPipelineTemplates
@@ -112,6 +113,8 @@ extends:
                 displayName: Sign extension
                 inputs:
                   script: dotnet %MBSIGN_APPFOLDER%/ddsignfiles.dll /file:extension.signature.p7s /certs:4014052
+                env:
+                  SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               - task: CopyFiles@2
                 displayName: "Copy Files to: $(Build.ArtifactStagingDirectory)/vsix"
                 inputs:
diff --git a/.azure-pipelines/rc.yml b/.azure-pipelines/rc.yml
index 0a485005..c17dd6b7 100644
--- a/.azure-pipelines/rc.yml
+++ b/.azure-pipelines/rc.yml
@@ -14,9 +14,10 @@ resources:
     - repository: self
       type: git
       ref: refs/heads/main
-    - repository: MicroBuildTemplate
+    - repository: CustomPipelineTemplates
       type: git
       name: 1ESPipelineTemplates/MicroBuildTemplate
+      ref: refs/tags/release
 trigger: none
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@CustomPipelineTemplates
@@ -110,6 +111,8 @@ extends:
                 displayName: Sign extension
                 inputs:
                   script: dotnet %MBSIGN_APPFOLDER%/ddsignfiles.dll /file:extension.signature.p7s /certs:4014052
+                env:
+                  SYSTEM_ACCESSTOKEN: $(System.AccessToken)
               - task: CopyFiles@2
                 displayName: "Copy Files to: $(Build.ArtifactStagingDirectory)/vsix"
                 inputs: