diff --git a/Dockerfile b/Dockerfile
index ac85d0f..ca2445c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1 - Build the frontend
-FROM node:12.15-buster AS node-build-env
+FROM amd64/node:15.5-buster AS node-build-env
 
 RUN mkdir /appclient
 WORKDIR /appclient
@@ -20,7 +20,7 @@ RUN dotnet build -c Release
 RUN dotnet publish -c Release -o out
 
 # Stage 3 - Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0.2-buster-slim AS base
 RUN mkdir /app
 WORKDIR /app
 COPY --from=dotnet-build-env /appserver/out .
diff --git a/docker-publish.bat b/docker-publish.bat
index 7630860..09ebe7e 100644
--- a/docker-publish.bat
+++ b/docker-publish.bat
@@ -1,2 +1 @@
-docker build --tag rogerfar/rdtclient .
-docker push rogerfar/rdtclient
\ No newline at end of file
+docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag rogerfar/rdtclient .