diff --git a/Directory.Build.targets b/Directory.Build.targets
index 76c63b71f..3783f1342 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -13,18 +13,18 @@
         <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.2.0" PrivateAssets="All" />
+        <PackageReference Include="Rocket.Surgery.Build.Metadata" Version="3.3.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.0.0" />
+        <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.1.7" />
         <PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
         <PackageReference Update="Bogus" Version="27.0.1" />
         <PackageReference Update="coverlet.msbuild" Version="2.6.1" />
         <PackageReference Update="FakeItEasy" Version="5.1.1" />
         <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="5.1.1" />
         <PackageReference Update="FluentAssertions" Version="5.6.0" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.1" />
         <PackageReference Update="xunit" Version="2.4.1" />
         <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
         <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 23ae05c1a..8b0ac5a21 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,8 +14,7 @@ resources:
     - repository: rsg
       type: github
       name: RocketSurgeonsGuild/AzureDevopsTemplates
-      ref: refs/heads/master
-      # ref: refs/tags/v0.5.6
+      ref: refs/tags/v0.5.8
       endpoint: github
 
 variables:
diff --git a/cakefile.cake b/cakefile.cake
index 4caae9589..ad72cc3ad 100644
--- a/cakefile.cake
+++ b/cakefile.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.3";
+#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.10";
 
 Task("Default")
     .IsDependentOn("dotnetcore");
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 6f4936e05..bb7ca9fde 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <Include>[Rocket.Surgery.*]*</Include>
     </PropertyGroup>
 </Project>