diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 3c8408e94..dc9e774c6 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -183,6 +183,7 @@ stages:
               _LinuxPortable: ''
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
+              _AdditionalBuildParameters: '/p:BuildSdkDeb=true'
               _TestArg: $(_NonWindowsTestArg)
             Build_Rhel_7_2_Release_x64:
               _BuildConfig: Release
@@ -296,7 +297,7 @@ stages:
               _BuildArchitecture: 'x64'
               # Do not publish zips and tarballs. The linux-x64 binaries are
               # already published by Build_LinuxPortable_Release_x64
-              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
+              _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false;BuildSdkDeb=true'
               _TestArg: $(_NonWindowsTestArg)
             Build_Linux_Portable_Rpm_Release_x64:
               _BuildConfig: Release
diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets
index 7135c8672..f0e7e5d14 100644
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@@ -228,7 +228,7 @@
   </Target>
 
   <Target Name="BuildSdkDeb"
-      Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(DebuildPresent)'  == 'true' "
+      Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(BuildSdkDeb)'  == 'true' "
       DependsOnTargets="PrepareDotnetDebDirectories;
                         GetAspNetSharedFxInstallArgs;"
       Inputs="@(CLISdkFiles);@(TemplatesFiles);@(ManifestFiles)"
@@ -342,7 +342,7 @@
   </Target>
 
   <Target Name="TestSdkDeb"
-      Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
+      Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsDebianBaseDistro)' == 'True' and '$(BuildSdkDeb)'  == 'true' "
       DependsOnTargets="GetAspNetSharedFxInstallArgs"
       Inputs="$(DownloadedRuntimeDepsInstallerFile);
               $(DownloadedNetCoreAppHostPackInstallerFile);
@@ -436,13 +436,12 @@
 
       <!-- Check if it returned 0 -->
       <PropertyGroup>
-        <DebuildPresent>false</DebuildPresent>
-        <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
+        <BuildSdkDeb Condition=" '$(BuildSdkDeb)' == '' or '$(DebuildExitCode)' != '0' ">false</BuildSdkDeb>
       </PropertyGroup>
 
       <!-- 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."
+      <Message Condition=" '$(BuildSdkDeb)' == 'false' "
+               Text="Debuild Not found or BuildSdkDeb not set, Debian packages will not be built."
                Importance="High" />
   </Target>
 </Project>