diff --git a/samples/build.ps1 b/samples/build.ps1
index e738e3bf5..128e9df38 100644
--- a/samples/build.ps1
+++ b/samples/build.ps1
@@ -18,6 +18,9 @@ try {
 
     # clean up all restore and build artifacts:
     Remove-Item .nuget, bin, obj -Recurse -Force -ErrorAction Ignore
+
+    ## Restore nbgv
+    PrintAndInvoke "dotnet tool restore" | Write-Host -ForegroundColor Gray
     
     # set env variable to use local CG.R packages
     $env:LocalNuGetVersion = dotnet nbgv get-version --variable NuGetPackageVersion --project ../src
diff --git a/templates/build.ps1 b/templates/build.ps1
index 1216f1ca4..23237997c 100644
--- a/templates/build.ps1
+++ b/templates/build.ps1
@@ -18,6 +18,9 @@ try {
 
     # clean up all restore and build artifacts:
     Remove-Item .nuget, bin, obj -Recurse -Force -ErrorAction Ignore
+
+    ## Restore nbgv
+    PrintAndInvoke "dotnet tool restore" | Write-Host -ForegroundColor Gray
     
     # set env variable to use local CG.R packages
     $env:LocalNuGetVersion = dotnet nbgv get-version --variable NuGetPackageVersion --project ../src