diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index b0b3d146d..374414c42 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -12,8 +12,7 @@
       <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)'))</BaseIntermediateOutputPath>
       <OutputDirectory>$(BaseOutputDirectory)/dotnet</OutputDirectory>
       <Stage2WithBackwardsCompatibleRuntimesOutputDirectory>$(BaseOutputDirectory)/dotnetWithBackwardsCompatibleRuntimes</Stage2WithBackwardsCompatibleRuntimesOutputDirectory>
-      <!-- licavalc: we will need to change this depending on how we expose toolset version in the SDK. Right now, keeping the toolset version -->
-      <SdkOutputDirectory>$(OutputDirectory)/sdk/$(ToolsetVersion)</SdkOutputDirectory>
+      <SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
       <SymbolsDirectory>$(BaseOutputDirectory)/symbols</SymbolsDirectory>
       <RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
       <FSharpDirectory>$(SdkOutputDirectory)/FSharp</FSharpDirectory>
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index ee0e506b6..ac8ccb4de 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -54,7 +54,7 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(Toolset)"
-          DestinationFiles="@(Toolset->'$(OutputDirectory)/sdk/$(ToolsetVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
+          DestinationFiles="@(Toolset->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <Target Name="PublishDotnetTools"