diff --git a/build/package/Microsoft.DotNet.Cli.Layout.targets b/build/package/Microsoft.DotNet.Cli.Layout.targets
index 37809a7fd..47a7b768e 100644
--- a/build/package/Microsoft.DotNet.Cli.Layout.targets
+++ b/build/package/Microsoft.DotNet.Cli.Layout.targets
@@ -6,6 +6,11 @@
   <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
     <PropertyGroup>
       <LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory>
+
+      <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
+      <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
+      <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
+      <CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
     </PropertyGroup>
 
     <!-- Set up Items with Layout Input Files -->
@@ -23,7 +28,7 @@
       <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
-      Path1="$(OutputDirectory)"
+      Path1="$(Stage2SymbolsDirectory)"
       Path2="%(SdkDebugLayoutInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" />
     </MakeRelative>
@@ -38,13 +43,6 @@
       <Output TaskParameter="RelativePath" ItemName="CombinedFrameworkSdkOutputFiles" />
     </MakeRelative>
 
-    <PropertyGroup>
-      <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
-      <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
-      <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
-      <CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
-    </PropertyGroup>
-
     <!-- Set up Items Defining Layouts for easy change -->
     <ItemGroup>
       <LayoutDefinition Include="Sdk">