diff --git a/build/InstallerInfo.props b/build/InstallerInfo.props
index aa2039683..45ed71636 100644
--- a/build/InstallerInfo.props
+++ b/build/InstallerInfo.props
@@ -4,7 +4,9 @@
     <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
     <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
 
-    <LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory>
+    <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+    <LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' ">$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
+    <LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' ">$(IntermediateDirectory)/layouts</LayoutDirectory>
     <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
   </PropertyGroup>
 
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 10dd92e7e..1c116f00f 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -1,22 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-      <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
-      <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
-      <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
-    </PropertyGroup>
+  <PropertyGroup>
+    <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
+    <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+  </PropertyGroup>
 
-    <Target Name="SetupDebProps"
+  <!-- dotnet deb-tool -->
+  <PropertyGroup>
+    <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
+    <DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
+    <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
+    <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
+    <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
+  </PropertyGroup>
+
+  <!-- constants -->
+  <PropertyGroup>
+    <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
+
+    <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
+    <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
+    <LayoutSamplesDirName>samples</LayoutSamplesDirName>
+    <LayoutDocsDirName>docs</LayoutDocsDirName>
+    <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
+  </PropertyGroup>
+
+  <!-- Package Identities -->
+  <PropertyGroup>
+    <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
+    <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
+    <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
+    <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
+    <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
+    <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
+    <HostDebianPackageName>dotnet-host</HostDebianPackageName>
+
+    <AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
+    <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
+    <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
+    <AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
+    <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
+    <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
+  </PropertyGroup>
+
+  <!-- Inputs -->
+  <PropertyGroup>
+    <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
+    <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
+    <CLISdkRoot>$(Stage2Directory)/sdk</CLISdkRoot>
+  </PropertyGroup>
+
+  <!-- Output Directories -->
+  <PropertyGroup>
+    <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
+    <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
+  </PropertyGroup>
+
+  <!-- Layout Directories -->
+  <PropertyGroup>
+    <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
+    <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
+    <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
+    <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
+    <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
+  </PropertyGroup>
+
+  <!-- debian_config.json -->
+  <PropertyGroup>
+    <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
+    <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
+  </PropertyGroup>
+
+  <Target Name="SetupDebProps"
           DependsOnTargets="Init">
-    <!-- dotnet deb-tool -->
-    <PropertyGroup>
-      <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>  
-      <DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
-      <DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
-      <DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
-      <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
-    </PropertyGroup>  
-
     <ItemGroup>
       <DotnetDebToolProjectJsonLines Include="{" />
       <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
@@ -26,69 +82,11 @@
       <DotnetDebToolProjectJsonLines Include="}" />
     </ItemGroup>
 
-    <!-- constants -->
-    <PropertyGroup>
-      <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
-
-      <LayoutPackageRootDirName>package_root</LayoutPackageRootDirName>
-      <LayoutAbsolutePlacementDirName>$</LayoutAbsolutePlacementDirName>
-      <LayoutSamplesDirName>samples</LayoutSamplesDirName>
-      <LayoutDocsDirName>docs</LayoutDocsDirName>
-      <LayoutDebianFilesDirName>debian</LayoutDebianFilesDirName>
-    </PropertyGroup>
-
-    <!-- Package Identities -->
-    <PropertyGroup>
-      <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
-      <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
-      <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
-      <HostFxrDebianPackageVersion>$(HostFxrVersion)</HostFxrDebianPackageVersion>
-      <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
-      <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
-      <HostDebianPackageName>dotnet-host</HostDebianPackageName>
-
-      <AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
-      <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
-      <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
-      <AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
-      <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
-      <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
-    </PropertyGroup>
-
-    <!-- Inputs -->
-    <PropertyGroup>
-      <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
-      <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
-      <CLISdkRoot>$(Stage2Directory)/sdk</CLISdkRoot>
-    </PropertyGroup>
-
     <ItemGroup>
       <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
       <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
     </ItemGroup>
 
-    <!-- Output Directories -->
-    <PropertyGroup>
-      <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
-      <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
-    </PropertyGroup>
-
-    <!-- Layout Directories -->
-    <PropertyGroup>
-      <LayoutDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
-      <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
-      <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
-      <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
-      <LayoutDocsDir>$(LayoutDirectory)/$(LayoutDocsDirName)</LayoutDocsDir>
-      <LayoutDebianFilesDir>$(LayoutDirectory)/$(LayoutDebianFilesDirName)</LayoutDebianFilesDir>
-    </PropertyGroup>
-
-    <!-- debian_config.json -->
-    <PropertyGroup>
-      <DebianConfigTemplateFile>$(RepoRoot)/packaging/deb/dotnet-debian_config.json</DebianConfigTemplateFile>
-      <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
-    </PropertyGroup>
-
     <ItemGroup>
       <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
         <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>