diff --git a/Dockerfile.linuxamd64 b/Dockerfile.linuxamd64
index a87dca037..298c31978 100644
--- a/Dockerfile.linuxamd64
+++ b/Dockerfile.linuxamd64
@@ -1,11 +1,11 @@
-FROM microsoft/dotnet:2.1.505-sdk-alpine3.7 AS builder
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505-alpine3.7 AS builder
 WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj
 RUN dotnet restore
 COPY BTCPayServer/. .
 RUN dotnet publish --output /app/ --configuration Release
 
-FROM microsoft/dotnet:2.1.9-aspnetcore-runtime-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-alpine3.7
 
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
 RUN apk add --no-cache icu-libs
diff --git a/Dockerfile.linuxarm32v7 b/Dockerfile.linuxarm32v7
index 8c9e06649..b6a1b3526 100644
--- a/Dockerfile.linuxarm32v7
+++ b/Dockerfile.linuxarm32v7
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM microsoft/dotnet:2.1.505-sdk AS builder
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1.505 AS builder
 WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj
 RUN dotnet restore
@@ -7,7 +7,7 @@ COPY BTCPayServer/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
-FROM microsoft/dotnet:2.1.9-aspnetcore-runtime-stretch-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-stretch-slim-arm32v7
 
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8