diff --git a/Directory.Build.props b/Directory.Build.props
index b1f50e7b1..c87c75734 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -104,7 +104,7 @@
   </ItemGroup>
 
   <!-- Add MSBuild.Community.Tasks to use the TemplateFile Task-->
-  <ItemGroup Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
+  <ItemGroup>
     <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true" DevelopmentDependency="true" />
   </ItemGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index e84907085..f2ce406a1 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,10 @@
 <Project>
 
-  <Import Project="$(PkgMSBuildTasks)\tools\MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"/>
+  <PropertyGroup Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
+      <MSBuildCommunityTasksPath>$(PkgMSBuildTasks)\tools\</MSBuildCommunityTasksPath>
+  </PropertyGroup>
+  
+  <Import Project="$(MSBuildCommunityTasksPath)MSBuild.Community.Tasks.Targets" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"/>
 
   <Target Name="ProcessTemplates" BeforeTargets="PrepareForBuild" Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')">
     <Message Text="Processing: $(ProjectDir)$(ProjectName).Credentials.template" Importance="high"/> 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5043dd397..21d640496 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,22 +28,13 @@ stages:
       vmImage: 'Windows-latest'
 
     steps:
-    - task: NuGetToolInstaller@1
-
-    - task: NuGetCommand@2
-      displayName: NuGet restore
-      inputs:
-        command: 'restore'
-        restoreSolution: '$(solution)'
-        feedsToUse: config
-
     - task: MSBuild@1
-      displayName: Generate templates
+      displayName: Restore nuget packages and generate credential templates
       inputs:
         solution: '$(solution)'
         platform: $(buildPlatform)
         configuration: $(buildConfiguration)
-        msbuildArguments: '/t:PrepareForBuild'
+        msbuildArguments: '/restore /t:PrepareForBuild'
 
     - task: MSBuild@1
       displayName: Build and package