diff --git a/2.1/alpine/amd64/runtime/Dockerfile b/2.1/alpine/amd64/runtime/Dockerfile
deleted file mode 100644
index a4202e35..00000000
--- a/2.1/alpine/amd64/runtime/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM microsoft/dotnet-nightly:2.1-runtime-deps-alpine
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-# Workaround https://github.com/aspnet/libuv-package/issues/23
-# Install libuv globally and link it so coreclr can laod it
-RUN apk add --no-cache libuv \
-    && ln -s /usr/lib/libuv.so.1 /usr/lib/libuv.so
-
-# Install ASP.NET Core
-ENV ASPNETCORE_VERSION 2.1.0-preview2-30457
-
-RUN apk add --no-cache --virtual .build-deps \
-        openssl \
-    && wget -O aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-alpine.3.6-x64.tar.gz \
-    && mkdir -p /usr/share/dotnet \
-    && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \
-    && rm aspnetcore.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \
-    && apk del .build-deps
diff --git a/2.1/bionic/amd64/runtime/Dockerfile b/2.1/bionic/amd64/runtime/Dockerfile
deleted file mode 100644
index 9165ebee..00000000
--- a/2.1/bionic/amd64/runtime/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM microsoft/dotnet-nightly:2.1-runtime-deps-bionic
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ASP.NET Core
-ENV ASPNETCORE_VERSION 2.1.0-preview2-30457
-
-RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-x64.tar.gz \
-    && mkdir -p /usr/share/dotnet \
-    && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \
-    && rm aspnetcore.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/2.1/bionic/amd64/sdk/Dockerfile b/2.1/bionic/amd64/sdk/Dockerfile
deleted file mode 100644
index dbcfbdb4..00000000
--- a/2.1/bionic/amd64/sdk/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM microsoft/dotnet-nightly:2.1.300-preview2-sdk-bionic
-
-# set up environment
-ENV ASPNETCORE_URLS http://+:80
-
-# set up node
-ENV NODE_VERSION 8.9.4
-ENV NODE_DOWNLOAD_SHA 21fb4690e349f82d708ae766def01d7fec1b085ce1f5ab30d9bda8ee126ca8fc
-
-RUN curl -SL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" --output nodejs.tar.gz \
-    && echo "$NODE_DOWNLOAD_SHA nodejs.tar.gz" | sha256sum -c - \
-    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 \
-    && rm nodejs.tar.gz \
-    && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-# Ensure packages required for standalone apps are pre-fetched
-
-RUN mkdir /tmp/warmup \
-    && cd /tmp/warmup \
-    && dotnet new web --no-restore \
-    && dotnet restore -p:RuntimeIdentifier=ubuntu.18.04-x64 \
-        --source https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json \
-        --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json \
-        --source https://api.nuget.org/v3/index.json \
-    && cd / \
-    && rm -rf /tmp/warmup
-
-WORKDIR /root/code
diff --git a/2.1/nanoserver-1709/amd64/runtime/Dockerfile b/2.1/nanoserver-1709/amd64/runtime/Dockerfile
deleted file mode 100644
index dcfada03..00000000
--- a/2.1/nanoserver-1709/amd64/runtime/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# escape=`
-
-# Installer image
-FROM microsoft/windowsservercore:1709 AS installer-env
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# Retrieve ASP.NET Core Runtime
-ENV ASPNETCORE_VERSION 2.1.0-preview2-30457
-
-RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$Env:ASPNETCORE_VERSION/aspnetcore-runtime-$Env:ASPNETCORE_VERSION-win-x64.zip; `
-    Expand-Archive aspnetcore.zip -DestinationPath dotnet; `
-    Remove-Item -Force aspnetcore.zip
-
-# Runtime image
-FROM microsoft/nanoserver:1709
-
-# Note: Runtime image's SHELL is the CMD shell (different than the installer image).
-
-# Set up network
-ENV ASPNETCORE_URLS http://+:80
-
-COPY --from=installer-env ["dotnet", "C:\\Program Files\\dotnet"]
-
-# In order to set system PATH, ContainerAdministrator must be used
-USER ContainerAdministrator
-RUN setx /M PATH "%PATH%;C:\Program Files\dotnet"
-USER ContainerUser
diff --git a/2.1/nanoserver-1709/amd64/sdk/Dockerfile b/2.1/nanoserver-1709/amd64/sdk/Dockerfile
deleted file mode 100644
index b602c05b..00000000
--- a/2.1/nanoserver-1709/amd64/sdk/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-# escape=`
-
-# Installer image
-FROM microsoft/windowsservercore:1709 AS installer-env
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# Retrieve node and git
-## https://nodejs.org/dist/v8.9.4/
-ENV NODE_VERSION 8.9.4
-ENV NODE_DOWNLOAD_SHA 48946e99ac4484e071df25741d2300f3a656f476c5ff3f8116a4746c07ebe3b7
-
-RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSION}/node-v${env:NODE_VERSION}-win-x64.zip -outfile node.zip; `
-    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_DOWNLOAD_SHA) { `
-        Write-Host 'NODEJS CHECKSUM VERIFICATION FAILED!'; `
-        exit 1; `
-    }; `
-    `
-    Expand-Archive node.zip -DestinationPath nodejs-tmp; `
-    Move-Item nodejs-tmp/node-v${env:NODE_VERSION}-win-x64 nodejs; `
-    Remove-Item -Force node.zip; `
-    Remove-Item -Force nodejs-tmp
-
-# Build image
-FROM microsoft/dotnet-nightly:2.1.300-preview2-sdk-nanoserver-1709
-
-# Set up environment
-ENV ASPNETCORE_URLS http://+:80
-
-COPY --from=installer-env ["nodejs", "C:\\Program Files\\nodejs"]
-
-# In order to set system PATH, ContainerAdministrator must be used
-USER ContainerAdministrator
-RUN setx PATH "%PATH%;C:\Program Files\nodejs"
-USER ContainerUser
-
-# Note: Build image's SHELL is the CMD shell (different than the installer image).
-# Ensure packages required for standalone apps are pre-fetched
-RUN mkdir "%TEMP%/warmup" `
-    && cd "%TEMP%/warmup" `
-    && dotnet new web --no-restore `
-    && dotnet restore -p:RuntimeIdentifier=win7-x64 `
-        --source https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json `
-        --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json `
-        --source https://api.nuget.org/v3/index.json `
-    && cd .. `
-    && rmdir /s /q "%TEMP%/warmup"
diff --git a/2.1/nanoserver-sac2016/amd64/runtime/Dockerfile b/2.1/nanoserver-sac2016/amd64/runtime/Dockerfile
deleted file mode 100644
index ff82a7c8..00000000
--- a/2.1/nanoserver-sac2016/amd64/runtime/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# escape=`
-FROM microsoft/nanoserver:sac2016
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-# Retrieve ASP.NET Core Runtime
-ENV ASPNETCORE_VERSION 2.1.0-preview2-30457
-
-RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$Env:ASPNETCORE_VERSION/aspnetcore-runtime-$Env:ASPNETCORE_VERSION-win-x64.zip; `
-    Expand-Archive aspnetcore.zip -DestinationPath  $Env:ProgramFiles\dotnet; `
-    Remove-Item -Force aspnetcore.zip
-RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '\dotnet')
diff --git a/2.1/nanoserver-sac2016/amd64/sdk/Dockerfile b/2.1/nanoserver-sac2016/amd64/sdk/Dockerfile
deleted file mode 100644
index 284b42ad..00000000
--- a/2.1/nanoserver-sac2016/amd64/sdk/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# escape=`
-FROM microsoft/dotnet-nightly:2.1.300-preview2-sdk-nanoserver-sac2016
-
-# set up environment
-ENV ASPNETCORE_URLS http://+:80
-
-# Retrieve node and git
-## https://nodejs.org/dist/v8.9.4/
-ENV NODE_VERSION 8.9.4
-ENV NODE_DOWNLOAD_SHA 48946e99ac4484e071df25741d2300f3a656f476c5ff3f8116a4746c07ebe3b7
-
-RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSION}/node-v${env:NODE_VERSION}-win-x64.zip -outfile node.zip; `
-    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_DOWNLOAD_SHA) { `
-        Write-Host 'NODEJS CHECKSUM VERIFICATION FAILED!'; `
-        exit 1; `
-    }; `
-    `
-    Expand-Archive node.zip -DestinationPath nodejs-tmp; `
-    Move-Item nodejs-tmp/node-v${env:NODE_VERSION}-win-x64 "${Env:ProgramFiles}/nodejs"; `
-    Remove-Item -Force node.zip; `
-    Remove-Item -Force nodejs-tmp
-
-RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '/nodejs')
-
-# Ensure packages required for standalone apps are pre-fetched
-RUN mkdir $env:TEMP\warmup; `
-    cd $env:TEMP\warmup; `
-    dotnet new web --no-restore; `
-    dotnet restore -p:RuntimeIdentifier=win7-x64 `
-        --source https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json `
-        --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json `
-        --source https://api.nuget.org/v3/index.json; `
-    cd ..; `
-    rm -Recurse -Force $env:TEMP\warmup
diff --git a/2.1/stretch-slim/amd64/runtime/Dockerfile b/2.1/stretch-slim/amd64/runtime/Dockerfile
deleted file mode 100644
index 46cd2302..00000000
--- a/2.1/stretch-slim/amd64/runtime/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM microsoft/dotnet-nightly:2.1-runtime-deps-stretch-slim
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ASP.NET Core
-ENV ASPNETCORE_VERSION 2.1.0-preview2-30457
-
-RUN curl -SL --output aspnetcore.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/$ASPNETCORE_VERSION/aspnetcore-runtime-$ASPNETCORE_VERSION-linux-x64.tar.gz \
-    && mkdir -p /usr/share/dotnet \
-    && tar -zxf aspnetcore.tar.gz -C /usr/share/dotnet \
-    && rm aspnetcore.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
diff --git a/2.1/stretch/amd64/sdk/Dockerfile b/2.1/stretch/amd64/sdk/Dockerfile
deleted file mode 100644
index 5a5297c1..00000000
--- a/2.1/stretch/amd64/sdk/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM microsoft/dotnet-nightly:2.1.300-preview2-sdk-stretch
-
-# set up environment
-ENV ASPNETCORE_URLS http://+:80
-
-# set up node
-ENV NODE_VERSION 8.9.4
-ENV NODE_DOWNLOAD_SHA 21fb4690e349f82d708ae766def01d7fec1b085ce1f5ab30d9bda8ee126ca8fc
-
-RUN curl -SL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" --output nodejs.tar.gz \
-    && echo "$NODE_DOWNLOAD_SHA nodejs.tar.gz" | sha256sum -c - \
-    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 \
-    && rm nodejs.tar.gz \
-    && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-# Ensure packages required for standalone apps are pre-fetched
-RUN mkdir /tmp/warmup \
-    && cd /tmp/warmup \
-    && dotnet new web --no-restore \
-    && dotnet restore -p:RuntimeIdentifier=debian.8-x64 \
-        --source https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json \
-        --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json \
-        --source https://api.nuget.org/v3/index.json \
-    && cd / \
-    && rm -rf /tmp/warmup
-
-WORKDIR /root/code
diff --git a/README.aspnetcore-build-nightly.md b/README.aspnetcore-build-nightly.md
index 185f21ea..5ec15ff3 100644
--- a/README.aspnetcore-build-nightly.md
+++ b/README.aspnetcore-build-nightly.md
@@ -9,19 +9,15 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
 - [`1.1.7-1.1.8-jessie`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/sdk/Dockerfile)
 - [`2.0.6-2.1.101-stretch`, `2.0-stretch`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/stretch/sdk/Dockerfile)
 - [`2.0.6-2.1.101-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/jessie/sdk/Dockerfile)
-- [`2.1.300-preview2-bionic` (*2.1/bionic/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/bionic/amd64/sdk/Dockerfile)
-- [`2.1.300-preview2-stretch`, `2.1.300-preview2` (*2.1/stretch/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/stretch/amd64/sdk/Dockerfile)
 
 # Windows Server, version 1709 amd64 tags
 
 - [`2.0.6-2.1.101-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-1709/sdk/Dockerfile)
-- [`2.1.300-preview2-nanoserver-1709`, `2.1.300-preview2` (*2.1/nanoserver-1709/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/nanoserver-1709/amd64/sdk/Dockerfile)
 
 # Windows Server 2016 amd64 tags
 
 - [`1.1.7-1.1.8-nanoserver-sac2016`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/sdk/Dockerfile)
 - [`2.0.6-2.1.101-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-sac2016/sdk/Dockerfile)
-- [`2.1.300-preview2-nanoserver-sac2016`, `2.1.300-preview2` (*2.1/nanoserver-sac2016/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/nanoserver-sac2016/amd64/sdk/Dockerfile)
 
 >**Note:** ASP.NET Core multi-arch tags, such as 2.0, have been updated to use nanoserver-1709 images if your host is Windows Server 2016 Version 1709 or higher or Windows 10 Fall Creators Update (Version 1709) or higher. You need Docker 17.10 or later to take advantage of these updated tags.
 
diff --git a/README.aspnetcore-build.md b/README.aspnetcore-build.md
index a0a2efad..8217b757 100644
--- a/README.aspnetcore-build.md
+++ b/README.aspnetcore-build.md
@@ -9,8 +9,6 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
 - [`1.1.7-1.1.8-jessie`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
 - [`2.0.6-2.1.101-stretch`, `2.0-stretch`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/stretch/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/sdk/Dockerfile)
 - [`2.0.6-2.1.101-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/sdk/Dockerfile)
-- [`2.1.300-preview1-bionic` (*2.1/bionic/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/bionic/amd64/sdk/Dockerfile)
-- [`2.1.300-preview1-stretch`, `2.1.300-preview1` (*2.1/stretch/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/stretch/amd64/sdk/Dockerfile)
 - [`1.0-1.1-jessie`, `1.0-1.1` (*1.1/jessie/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/kitchensink/Dockerfile)
 - [`1.0-2.0-stretch`, `1.0-2.0` (*2.0/stretch/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/kitchensink/Dockerfile)
 - [`1.0-2.0-jessie` (*2.0/jessie/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/kitchensink/Dockerfile)
@@ -18,13 +16,11 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
 # Supported Windows Server 2016 Version 1709 (Fall Creators Update) amd64 tags
 
 - [`2.0.6-2.1.101-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-1709/sdk/Dockerfile)
-- [`2.1.300-preview1-nanoserver-1709`, `2.1.300-preview1` (*2.1/nanoserver-1709/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/nanoserver-1709/amd64/sdk/Dockerfile)
 
 # Supported Windows Server 2016 amd64 tags
 
 - [`1.1.7-1.1.8-nanoserver-sac2016`, `1.1.7-1.1.8`, `1.1`, `1` (*1.1/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/sdk/Dockerfile)
 - [`2.0.6-2.1.101-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6-2.1.101`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/sdk/Dockerfile)
-- [`2.1.300-preview1-nanoserver-sac2016`, `2.1.300-preview1` (*2.1/nanoserver-sac2016/amd64/sdk/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/nanoserver-sac2016/amd64/sdk/Dockerfile)
 - [`1.0-1.1-nanoserver-sac2016`, `1.0-1.1` (*1.1/nanoserver-sac2016/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/kitchensink/Dockerfile)
 - [`1.0-2.0-nanoserver-sac2016`, `1.0-2.0` (*2.0/nanoserver-sac2016/kitchensink/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/kitchensink/Dockerfile)
 
diff --git a/README.aspnetcore-nightly.md b/README.aspnetcore-nightly.md
index 223076e0..c297584d 100644
--- a/README.aspnetcore-nightly.md
+++ b/README.aspnetcore-nightly.md
@@ -14,21 +14,16 @@ These images contain the runtime only. Use [`microsoft/aspnetcore-build-nightly`
 - [`1.1.7-jessie`, `1.1.7`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/jessie/runtime/Dockerfile)
 - [`2.0.6-stretch`, `2.0-stretch`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/stretch/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/stretch/runtime/Dockerfile)
 - [`2.0.6-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/jessie/runtime/Dockerfile)
-- [`2.1.0-preview2-alpine` (*2.1/alpine/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/alpine/amd64/runtime/Dockerfile)
-- [`2.1.0-preview2-bionic` (*2.1/bionic/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/bionic/amd64/runtime/Dockerfile)
-- [`2.1.0-preview2-stretch-slim`, `2.1.0-preview2` (*2.1/stretch-slim/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/stretch-slim/amd64/runtime/Dockerfile)
 
 # Windows Server, version 1709 amd64 tags
 
 - [`2.0.6-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-1709/runtime/Dockerfile)
-- [`2.1.0-preview2-nanoserver-1709`, `2.1.0-preview2` (*2.1/nanoserver-1709/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/nanoserver-1709/amd64/runtime/Dockerfile)
 
 # Windows Server 2016 amd64 tags
 
 - [`1.0.10-nanoserver-sac2016`, `1.0.10`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.0/nanoserver-sac2016/runtime/Dockerfile)
 - [`1.1.7-nanoserver-sac2016`, `1.1.7`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/1.1/nanoserver-sac2016/runtime/Dockerfile)
 - [`2.0.6-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.0/nanoserver-sac2016/runtime/Dockerfile)
-- [`2.1.0-preview2-nanoserver-sac2016`, `2.1.0-preview2` (*2.1/nanoserver-sac2016/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/dev/2.1/nanoserver-sac2016/amd64/runtime/Dockerfile)
 
 >**Note:** ASP.NET Core multi-arch tags, such as 2.0, have been updated to use nanoserver-1709 images if your host is Windows Server 2016 Version 1709 or higher or Windows 10 Fall Creators Update (Version 1709) or higher. You need Docker 17.10 or later to take advantage of these updated tags.
 
diff --git a/README.aspnetcore.md b/README.aspnetcore.md
index 3e77b45b..78c1681c 100644
--- a/README.aspnetcore.md
+++ b/README.aspnetcore.md
@@ -14,20 +14,16 @@ These images contain the runtime only. Use [`microsoft/aspnetcore-build`](https:
 - [`1.1.7-jessie`, `1.1.7`, `1.1`, `1` (*1.1/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile)
 - [`2.0.6-stretch`, `2.0-stretch`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/stretch/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/stretch/runtime/Dockerfile)
 - [`2.0.6-jessie`, `2.0-jessie`, `2-jessie` (*2.0/jessie/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/jessie/runtime/Dockerfile)
-- [`2.1.0-preview1-bionic` (*2.1/bionic/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/bionic/amd64/runtime/Dockerfile)
-- [`2.1.0-preview1-stretch-slim`, `2.1.0-preview1` (*2.1/stretch-slim/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/stretch-slim/amd64/runtime/Dockerfile)
 
 # Supported Windows Server 2016 Version 1709 (Fall Creators Update) amd64 tags
 
 - [`2.0.6-nanoserver-1709`, `2.0-nanoserver-1709`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/nanoserver-1709/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-1709/runtime/Dockerfile)
-- [`2.1.0-preview1-nanoserver-1709`, `2.1.0-preview1` (*2.1/nanoserver-1709/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/nanoserver-1709/amd64/runtime/Dockerfile)
 
 # Supported Windows Server 2016 amd64 tags
 
 - [`1.0.10-nanoserver-sac2016`, `1.0.10`, `1.0` (*1.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/nanoserver-sac2016/runtime/Dockerfile)
 - [`1.1.7-nanoserver-sac2016`, `1.1.7`, `1.1`, `1` (*1.1/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/nanoserver-sac2016/runtime/Dockerfile)
 - [`2.0.6-nanoserver-sac2016`, `2.0-nanoserver-sac2016`, `2.0.6`, `2.0`, `2`, `latest` (*2.0/nanoserver-sac2016/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.0/nanoserver-sac2016/runtime/Dockerfile)
-- [`2.1.0-preview1-nanoserver-sac2016`, `2.1.0-preview1` (*2.1/nanoserver-sac2016/amd64/runtime/Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/2.1/nanoserver-sac2016/amd64/runtime/Dockerfile)
 
 >**Note:** ASP.NET Core multi-arch tags, such as 2.0, have been updated to use nanoserver-1709 images if your host is Windows Server 2016 Version 1709 or higher or Windows 10 Fall Creators Update (Version 1709) or higher. You need Docker 17.10 or later to take advantage of these updated tags.
 
diff --git a/build-pipeline/pipeline.json b/build-pipeline/pipeline.json
index 40cef718..99df4ad2 100644
--- a/build-pipeline/pipeline.json
+++ b/build-pipeline/pipeline.json
@@ -24,12 +24,6 @@
           "Parameters": {
             "PB.image-builder.path": "2.0/*"
           }
-        },
-        {
-          "Name": "aspnet-docker-linux-images",
-          "Parameters": {
-            "PB.image-builder.path": "2.1/*"
-          }
         }
       ]
     },
@@ -50,12 +44,6 @@
           "Parameters": {
             "PB.image-builder.path": "2.0/nanoserver-sac2016/*"
           }
-        },
-        {
-          "Name": "aspnet-docker-windows-images",
-          "Parameters": {
-            "PB.image-builder.path": "2.1/nanoserver-sac2016/*"
-          }
         }
       ]
     },
@@ -70,12 +58,6 @@
           "Parameters": {
             "PB.image-builder.path": "2.0/nanoserver-1709/*"
           }
-        },
-        {
-          "Name": "aspnet-docker-windows-1709-images",
-          "Parameters": {
-            "PB.image-builder.path": "2.1/nanoserver-1709/*"
-          }
         }
       ]
     },
diff --git a/build-pipeline/pipelinejobs.groovy b/build-pipeline/pipelinejobs.groovy
index 47a8b60d..b763e6b4 100644
--- a/build-pipeline/pipelinejobs.groovy
+++ b/build-pipeline/pipelinejobs.groovy
@@ -3,7 +3,7 @@ import org.dotnet.ci.pipelines.Pipeline
 def windowsPipeline = Pipeline.createPipeline(this, 'build-pipeline/windows-pipeline.groovy')
 
 // Images that can only build on RS1, not RS3
-['1.*', '2.0/nanoserver-sac2016/*', '2.1/nanoserver-sac2016/*'].each { folderFilter ->
+['1.*', '2.0/nanoserver-sac2016/*'].each { folderFilter ->
     def triggerName = "Windows SAC2016 ${folderFilter[0..-3]} Build"
 
     windowsPipeline.triggerPipelineOnEveryGithubPR(triggerName, ['folderFilter':folderFilter])
@@ -11,16 +11,13 @@ def windowsPipeline = Pipeline.createPipeline(this, 'build-pipeline/windows-pipe
 }
 
 // Images that can only build on RS3, not RS1
-['2.0/nanoserver-1709/*', '2.1/nanoserver-1709/*'].each { folderFilter ->
-    def triggerName = "Windows 1709 ${folderFilter[0..-3]} Build"
-
-    windowsPipeline.triggerPipelineOnEveryGithubPR(triggerName, ['RS3':true, 'folderFilter':folderFilter])
-    windowsPipeline.triggerPipelineOnPush(triggerName, ['RS3':true, 'folderFilter':folderFilter])
-}
+def rs3TriggerName = "Windows 1709 2.0/nanoserver-1709 Build"
+windowsPipeline.triggerPipelineOnEveryGithubPR(rs3TriggerName, ['RS3':true, 'folderFilter':'2.0/nanoserver-1709/*'])
+windowsPipeline.triggerPipelineOnPush(rs3TriggerName, ['RS3':true, 'folderFilter':'2.0/nanoserver-1709/*'])
 
 def linuxPipeline = Pipeline.createPipeline(this, 'build-pipeline/linux-pipeline.groovy')
 
-['1.*', '2.0/*', '2.1/*'].each { folderFilter ->
+['1.*', '2.0/*'].each { folderFilter ->
     def triggerName = "Linux ${folderFilter[0..-3]} Build"
 
     linuxPipeline.triggerPipelineOnEveryGithubPR(triggerName, ['folderFilter':folderFilter])
diff --git a/manifest.json b/manifest.json
index bd1dcbc0..13bb8fab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -111,57 +111,6 @@
               }
             }
           ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "2.1/alpine/amd64/runtime",
-              "os": "linux",
-              "tags": {
-                "2.1.0-preview2-alpine": {}
-              }
-            }
-          ]
-        },
-        {
-          "platforms": [
-            {
-              "dockerfile": "2.1/bionic/amd64/runtime",
-              "os": "linux",
-              "tags": {
-                "2.1.0-preview2-bionic": {}
-              }
-            }
-          ]
-        },
-        {
-          "sharedTags": {
-            "2.1.0-preview2": {}
-          },
-          "platforms": [
-            {
-              "dockerfile": "2.1/stretch-slim/amd64/runtime",
-              "os": "linux",
-              "tags": {
-                "2.1.0-preview2-stretch-slim": {}
-              }
-            },
-            {
-              "dockerfile": "2.1/nanoserver-sac2016/amd64/runtime",
-              "os": "windows",
-              "tags": {
-                "2.1.0-preview2-nanoserver-sac2016": {}
-              }
-            },
-            {
-              "dockerfile": "2.1/nanoserver-1709/amd64/runtime",
-              "os": "windows",
-              "osVersion": "1709",
-              "tags": {
-                "2.1.0-preview2-nanoserver-1709": {}
-              }
-            }
-          ]
         }
       ]
     },
@@ -249,46 +198,6 @@
             }
           ]
         },
-        {
-          "platforms": [
-            {
-              "dockerfile": "2.1/bionic/amd64/sdk",
-              "os": "linux",
-              "tags": {
-                "2.1.300-preview2-bionic": {}
-              }
-            }
-          ]
-        },
-        {
-          "sharedTags": {
-            "2.1.300-preview2": {}
-          },
-          "platforms": [
-            {
-              "dockerfile": "2.1/stretch/amd64/sdk",
-              "os": "linux",
-              "tags": {
-                "2.1.300-preview2-stretch": {}
-              }
-            },
-            {
-              "dockerfile": "2.1/nanoserver-sac2016/amd64/sdk",
-              "os": "windows",
-              "tags": {
-                "2.1.300-preview2-nanoserver-sac2016": {}
-              }
-            },
-            {
-              "dockerfile": "2.1/nanoserver-1709/amd64/sdk",
-              "os": "windows",
-              "osVersion": "1709",
-              "tags": {
-                "2.1.300-preview2-nanoserver-1709": {}
-              }
-            }
-          ]
-        },
         {
           "sharedTags": {
             "1.0-1.1": {
diff --git a/test.ps1 b/test.ps1
index 2198a6c3..e0fc76af 100755
--- a/test.ps1
+++ b/test.ps1
@@ -175,14 +175,9 @@ try {
                     "1.1" { $sdk_tag -replace '-1.1.8', '' }
                     # map the 2.0.4-2.1.3 sdk tags to the runtime tag name
                     "2.0" { $sdk_tag -replace '-2.1.101', '' }
-                    # map the 2.1.300 sdk tags to the runtime tag name
-                    "2.1" { $sdk_tag -replace '2.1.300', '2.1.0' }
                     Default { $sdk_tag }
                 }
                 $runtime_tag = $runtime_tag -replace '-build', ''
-                if ($version -eq "2.1") {
-                    $runtime_tag = $runtime_tag -replace '-stretch', '-stretch-slim'
-                }
 
                 test_image $version $sdk_tag $runtime_tag