diff --git a/.pipelines/templates/packaging/windows/package.yml b/.pipelines/templates/packaging/windows/package.yml
index 83cdf730b5..2d2869867c 100644
--- a/.pipelines/templates/packaging/windows/package.yml
+++ b/.pipelines/templates/packaging/windows/package.yml
@@ -58,9 +58,8 @@ jobs:
   - template: /.pipelines/templates/cloneToOfficialPath.yml@self
     parameters:
       nativePathRoot: '$(Agent.TempDirectory)'
-      ob_restore_phase: false
 
-  - template: rebuild-branch-check.yml@self
+  - template: /.pipelines/templates/rebuild-branch-check.yml@self
 
   - download: CoOrdinatedBuildPipeline
     artifact: drop_windows_build_windows_${{ parameters.runtime }}_release
@@ -223,4 +222,6 @@ jobs:
 
   - pwsh: |
       Get-ChildItem -Path $(ob_outputDirectory) -Recurse
-    displayName: 'List unsigned artifacts'
+    displayName: 'List artifacts'
+    env:
+      ob_restore_phase: true # This ensures this done in restore phase to workaround signing issue