diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json
index de02296648dae246a989683691a06807cec7a9a0..e06fdf1934f03ff36be9356eea237f8ba0557602 100644
--- a/build/config/SignToolData.json
+++ b/build/config/SignToolData.json
@@ -109,8 +109,7 @@
         "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\\Roslyn\\RoslynDeployment.vsix",
-        "Vsix\\Templates\\Roslyn SDK.vsix",
-        "Vsix\\CodeAnalysisCompilers\\Microsoft.CodeAnalysis.Compilers.vsix"
+        "Vsix\\Templates\\Roslyn SDK.vsix"
       ]
     },
     {
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index eb2ea6fa2082478a06eb3a8ff92676ed48870a3b..3a1739a12e5427c64c18e34bbba300d081beb47a 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -179,6 +179,21 @@ function Build-Artifacts() {
 
     if ($buildAll) {
         Build-ExtraSignArtifacts
+    }
+
+    if ($pack) {
+        Build-NuGetPackages
+
+        if ($cibuild -or $official) { 
+            Build-DeployToSymStore
+        }
+    }
+
+    if ($sign) {
+        Run-SignTool
+    }
+
+    if ($buildAll) {
         Build-InsertionItems
     }
 }
@@ -636,18 +651,6 @@ try {
         Build-Artifacts
     }
 
-    if ($pack) {
-        Build-NuGetPackages
-
-        if ($cibuild -or $official) { 
-            Build-DeployToSymStore
-        }
-    }
-
-    if ($sign) {
-        Run-SignTool
-    }
-
     if ($testDesktop -or $testCoreClr -or $testVsi -or $testVsiNetCore) {
         Test-XUnit
     }