diff --git a/amd64.Dockerfile b/amd64.Dockerfile
index 401bc2b0e..fac94753f 100644
--- a/amd64.Dockerfile
+++ b/amd64.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder
+FROM mcr.microsoft.com/dotnet/sdk:3.1.413-bullseye AS builder
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 WORKDIR /source
 COPY nuget.config nuget.config
@@ -20,7 +20,7 @@ COPY Build/Version.csproj Build/Version.csproj
 ARG CONFIGURATION_NAME=Release
 RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME}
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim
+FROM mcr.microsoft.com/dotnet/aspnet:3.1.19-bullseye-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \
     && rm -rf /var/lib/apt/lists/* 
diff --git a/arm32v7.Dockerfile b/arm32v7.Dockerfile
index 0fec4c54e..209854811 100644
--- a/arm32v7.Dockerfile
+++ b/arm32v7.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder
+FROM mcr.microsoft.com/dotnet/sdk:3.1.413-bullseye AS builder
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 RUN apt-get update \
 	&& apt-get install -qq --no-install-recommends qemu qemu-user-static qemu-user binfmt-support
@@ -25,7 +25,7 @@ ARG CONFIGURATION_NAME=Release
 RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME}
 
 # 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 mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/aspnet:3.1.19-bullseye-slim-arm32v7
 COPY --from=builder /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
 RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \
     && rm -rf /var/lib/apt/lists/* 
diff --git a/arm64v8.Dockerfile b/arm64v8.Dockerfile
index 94e0ee5d4..c032a79dd 100644
--- a/arm64v8.Dockerfile
+++ b/arm64v8.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder
+FROM mcr.microsoft.com/dotnet/sdk:3.1.413-bullseye AS builder
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 ENV LC_ALL en_US.UTF-8
 RUN apt-get update \
@@ -26,7 +26,7 @@ ARG CONFIGURATION_NAME=Release
 RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME}
 
 # 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 mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/aspnet:3.1.19-bullseye-slim-arm64v8
 COPY --from=builder /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \
     && rm -rf /var/lib/apt/lists/*