diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
index a92277ff0..24c4dbe4e 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
@@ -6,6 +6,11 @@
             <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
         </Exec>
 
+        <!-- Workaround for Ubuntu16 Jenkins https://github.com/dotnet/core-setup/issues/167 -->
+        <Message Condition=" '$(DebuildPresent)'  != 'true' " 
+                 Text="Debuild Not found, Debian packages will not be built."
+                 Importance="High" />
+
         <PropertyGroup>
             <DebuildPresent>false</DebuildPresent>
             <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
@@ -28,31 +33,16 @@
             <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
             <DebianInstalledDotnet>/usr/share/dotnet/dotnet</DebianInstalledDotnet>
             <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
-
-            <SdkVersionSentinel>$(SdkDebianIntermediateDirectory)/$(SdkVersion).sentinel</SdkVersionSentinel>
         </PropertyGroup>
 
         <ItemGroup>
             <SdkDebInputFiles Include="$(SdkLayoutOutputDirectory)/**/*" />
         </ItemGroup>
-
-        <!-- Rebuild when version changes -->
-        <MakeDir Directories="$(SdkDebianIntermediateDirectory)" />
-        <WriteLinesToFile
-          File="$(SdkVersionSentinel)"
-          Lines="$(SdkVersion)"
-          Condition= "!Exists('$(SdkVersionSentinel)')"
-          Encoding="Unicode"/>
-
-        <Message Condition=" '$(DebuildPresent)'  != 'true' " 
-                 Text="Debuild Not found, Debian packages will not be built."
-                 Importance="High" />
-
     </Target>
 
     <Target Name="GenerateSdkDeb" 
         Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
-        Inputs="@(SdkDebInputFiles);$(SdkVersionSentinel)"
+        Inputs="@(SdkDebInputFiles);"
         Outputs="$(SdkInstallerFile)" >
 
         <!-- Install Packages -->
diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Microsoft.DotNet.Cli.Nupkg.targets
index f6f487221..f33c2f9ab 100644
--- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets
+++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets
@@ -58,13 +58,14 @@
           DependsOnTargets="SetupGenerateNugetPackagesInputsOutputs"
           Inputs="@(ProjectPackTargetInputs -> '%(Identity)')"
           Outputs="@(ProjectPackTargetOutputs -> '%(Identity)')">
-    
-    <Exec Command="$(DotnetStage2) pack %(ProjectsToPack.Identity) 
-                  --no-build 
-                  --build-base-path $(PackagingBuildBasePath) 
-                  --output $(NupkgOutputDirectory)
-                  --configuration $(Configuration)
-                  --version-suffix $(NupkgVersionSuffix)" />
+
+    <DotNetPack BuildBasePath="$(PackagingBuildBasePath)"
+                NoBuild="True"
+                Output="$(NupkgOutputDirectory)"
+                ProjectPath="%(ProjectsToPack.Identity)"
+                ToolPath="$(DotnetStage2)"
+                VersionSuffix="$(NupkgVersionSuffix)"
+                Configuration="$(Configuration)" />
   </Target>
 
   <Target Name="BuildProjectsForNuGetPackages"