diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 062c31da36..e4c4020483 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -27,24 +27,6 @@ jobs:
       testResultsFiles: '**/*.trx'
     condition: always()
 
-- job: debug_debian82_x64
-  displayName: Debian8.2 x64 Debug Build
-  pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: NetCorePublic-Pool
-      queue: BuildPool.Ubuntu.1604.Amd64.Open
-    ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-      name: NetCoreInternal-Pool
-      queue: BuildPool.Ubuntu.1604.Amd64
-    vmImage: ubuntu-16.04
-  steps:
-  - script: ./build.sh --skip-prereqs --configuration Debug --targets Default
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: VSTest
-      testResultsFiles: '**/*.trx'
-    condition: always()
-
 - job: debug_fedora27_x64
   displayName: fedora.27 x64 Debug Build
   pool:
diff --git a/build/LinuxDistrosNativeInstaller.props b/build/LinuxDistrosNativeInstaller.props
index d153e267a3..9ab844a680 100644
--- a/build/LinuxDistrosNativeInstaller.props
+++ b/build/LinuxDistrosNativeInstaller.props
@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
-    <LinuxDistrosNeedNativeInstaller Include="debian.8-x64">
-      <DockerFolder>debian</DockerFolder>
+    <LinuxDistrosNeedNativeInstaller Include="ubuntu.18.04-x64">
+      <DockerFolder>ubuntu.18.04</DockerFolder>
       <InstallerExtension>deb</InstallerExtension>
       <DistroNameInInstaller>x64</DistroNameInInstaller>
     </LinuxDistrosNeedNativeInstaller>
diff --git a/scripts/docker/debian/Dockerfile b/scripts/docker/debian/Dockerfile
deleted file mode 100644
index e8316daed0..0000000000
--- a/scripts/docker/debian/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153
-
-# Misc Dependencies for build
-RUN rm -rf /var/lib/apt/lists/* && \
-    apt-get update && \
-    apt-get -qqy install \
-        sudo && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Setup User to match Host User, and give superuser permissions
-ARG USER_ID=0
-RUN useradd -m code_executor -u ${USER_ID} -g sudo
-RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# With the User Change, we need to change permissions on these directories
-RUN chmod -R a+rwx /usr/local
-RUN chmod -R a+rwx /home
-RUN chmod -R 755 /usr/lib/sudo
-
-# Set user to the one we just created
-USER ${USER_ID}
-
-# Set working directory
-WORKDIR /opt/code
diff --git a/scripts/docker/ubuntu.18.04/Dockerfile b/scripts/docker/ubuntu.18.04/Dockerfile
index 97d0578c7b..7e3ecd72cf 100644
--- a/scripts/docker/ubuntu.18.04/Dockerfile
+++ b/scripts/docker/ubuntu.18.04/Dockerfile
@@ -4,7 +4,7 @@
 #
 
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20210111135546-cfdd435
 
 RUN apt-get update && \
     apt-get -qqy install \