diff --git a/.azure/templates/jobs/default-build.yml b/.azure/templates/jobs/default-build.yml
index d21607934..cdea997b0 100644
--- a/.azure/templates/jobs/default-build.yml
+++ b/.azure/templates/jobs/default-build.yml
@@ -83,14 +83,14 @@ jobs:
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
         name: NetCore1ESPool-Svc-Internal
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        name: NetCore1ESPool-Svc
+        name: NetCore-Svc-Public
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
       image: windows.vs2019.amd64
       os: windows
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
         name: NetCore1ESPool-Svc-Internal
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        name: NetCore1ESPool-Svc
+        name: NetCore-Svc-Public
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
diff --git a/build/dependencies.props b/build/dependencies.props
index ad8dafe6a..f14747e68 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -30,7 +30,7 @@
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
-    <Tooling_NuGetBuildTasksPackageVersion>4.7.0-netcore.2.1.preview2.5133</Tooling_NuGetBuildTasksPackageVersion>
+    <Tooling_NuGetBuildTasksPackageVersion>4.9.6</Tooling_NuGetBuildTasksPackageVersion>
   </PropertyGroup>
 
   <!-- These are set to flow into RepoTasks.csproj -->
diff --git a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs b/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs
deleted file mode 100644
index c9011c606..000000000
--- a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using NuGet.Commands;
-using NuGet.Common;
-using NuGet.DependencyResolver;
-using NuGet.LibraryModel;
-using NuGet.Packaging;
-using NuGet.Packaging.Core;
-using NuGet.Packaging.Signing;
-using NuGet.Protocol.Core.Types;
-
-namespace KoreBuild.Tasks.Utilities
-{
-    internal class SimplePackageInstaller
-    {
-        private readonly string _packagesDirectory;
-        private readonly ILogger _logger;
-        private readonly SourceCacheContext _cacheContext;
-        private readonly int _maxDegreeOfConcurrency;
-
-        public SimplePackageInstaller(string packageDir, SourceCacheContext cacheContext, bool disableParallel, ILogger logger)
-        {
-            _packagesDirectory = packageDir;
-            _cacheContext = cacheContext;
-            _logger = logger;
-            _maxDegreeOfConcurrency = disableParallel ? 1 : 16;
-        }
-
-        public async Task InstallPackagesAsync(IEnumerable<RestoreTargetGraph> graphs,
-            HashSet<LibraryIdentity> allInstalledPackages,
-            CancellationToken token)
-        {
-            var packagesToInstall = graphs.SelectMany(g => g.Install.Where(match => allInstalledPackages.Add(match.Library)));
-            if (_maxDegreeOfConcurrency <= 1)
-            {
-                foreach (var match in packagesToInstall)
-                {
-                    await InstallPackageAsync(match, token);
-                }
-            }
-            else
-            {
-                var bag = new ConcurrentBag<RemoteMatch>(packagesToInstall);
-                var tasks = Enumerable.Range(0, _maxDegreeOfConcurrency)
-                    .Select(async _ =>
-                    {
-                        while (bag.TryTake(out RemoteMatch match))
-                        {
-                            await InstallPackageAsync(match, token);
-                        }
-                    });
-                await Task.WhenAll(tasks);
-            }
-        }
-
-        private async Task InstallPackageAsync(RemoteMatch installItem, CancellationToken token)
-        {
-            var packageIdentity = new PackageIdentity(installItem.Library.Name, installItem.Library.Version);
-
-            var verificationProviders = SignatureVerificationProviderFactory.GetSignatureVerificationProviders();
-            var signedPackageVerifier = new PackageSignatureVerifier(verificationProviders, SignedPackageVerifierSettings.VerifyCommandDefaultPolicy);
-
-            var versionFolderPathResolver = new VersionFolderPathResolver(_packagesDirectory);
-            var packageExtractionContext = new PackageExtractionContext(
-                PackageSaveMode.Defaultv3,
-                XmlDocFileSaveMode.None,
-                _logger,
-                signedPackageVerifier);
-
-            using (var packageDependency = await installItem.Provider.GetPackageDownloaderAsync(
-                packageIdentity,
-                _cacheContext,
-                _logger,
-                token))
-            {
-                await PackageExtractor.InstallFromSourceAsync(
-                    packageIdentity,
-                    packageDependency,
-                    versionFolderPathResolver,
-                    packageExtractionContext,
-                    token);
-            }
-        }
-    }
-}