diff --git a/docker-compose-windows-1809.yml b/docker-compose-windows-1809.yml
index dd3f435..8c5c11e 100644
--- a/docker-compose-windows-1809.yml
+++ b/docker-compose-windows-1809.yml
@@ -3,7 +3,7 @@ version: "3.2"
 services:
   vote:
     image: dockersamples/examplevotingapp_vote:dotnet-nanoserver-1809
-    build: 
+    build:
       context: ./vote/dotnet
       dockerfile: Dockerfile.1809
     ports:
@@ -13,12 +13,12 @@ services:
 
   result:
     image: dockersamples/examplevotingapp_result:dotnet-nanoserver-1809
-    build: 
+    build:
       context: ./result/dotnet
       dockerfile: Dockerfile.1809
     ports:
       - "5001:80"
-    environment:      
+    environment:
       - "ConnectionStrings:ResultData=Server=db;Port=4000;Database=votes;User=root;SslMode=None"
     depends_on:
       - db
@@ -28,14 +28,14 @@ services:
     build:
       context: ./worker/dotnet
       dockerfile: Dockerfile.1809
-    environment:      
+    environment:
       - "ConnectionStrings:VoteData=Server=db;Port=4000;Database=votes;User=root;SslMode=None"
     depends_on:
       - message-queue
       - db
 
   message-queue:
-    image: dockersamples/nats:nanoserver-1809
+    image: nats:2.0.4
 
   db:
     image: dockersamples/tidb:nanoserver-1809
@@ -45,4 +45,4 @@ services:
 networks:
   default:
     external:
-      name: nat
\ No newline at end of file
+      name: nat
diff --git a/result/dotnet/Dockerfile.1809 b/result/dotnet/Dockerfile.1809
index 632a137..8595143 100644
--- a/result/dotnet/Dockerfile.1809
+++ b/result/dotnet/Dockerfile.1809
@@ -1,4 +1,4 @@
-FROM  microsoft/dotnet:2.1-sdk-nanoserver-1809 as builder
+FROM  mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
 
 WORKDIR /Result
 COPY Result/Result.csproj .
@@ -8,7 +8,7 @@ COPY /Result .
 RUN dotnet publish -c Release -o /out Result.csproj
 
 # app image
-FROM microsoft/dotnet:2.1-aspnetcore-runtime-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
 
 WORKDIR /app
 ENTRYPOINT ["dotnet", "Result.dll"]
diff --git a/vote/dotnet/Dockerfile.1809 b/vote/dotnet/Dockerfile.1809
index 13d33b7..a4f8685 100644
--- a/vote/dotnet/Dockerfile.1809
+++ b/vote/dotnet/Dockerfile.1809
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1-sdk-nanoserver-1809 as builder
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
 
 WORKDIR /Vote
 COPY Vote/Vote.csproj .
@@ -8,7 +8,7 @@ COPY /Vote .
 RUN dotnet publish -c Release -o /out Vote.csproj
 
 # app image
-FROM microsoft/dotnet:2.1-aspnetcore-runtime-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1
 
 WORKDIR /app
 ENTRYPOINT ["dotnet", "Vote.dll"]
diff --git a/worker/dotnet/Dockerfile.1809 b/worker/dotnet/Dockerfile.1809
index ef98805..c5f52c3 100644
--- a/worker/dotnet/Dockerfile.1809
+++ b/worker/dotnet/Dockerfile.1809
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1-sdk-nanoserver-1809 as builder
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
 
 WORKDIR /Worker
 COPY Worker/Worker.csproj .
@@ -8,7 +8,7 @@ COPY /Worker .
 RUN dotnet publish -c Release -o /out Worker.csproj
 
 # app image
-FROM microsoft/dotnet:2.1-aspnetcore-runtime-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:2.1
 
 WORKDIR /app
 ENTRYPOINT ["dotnet", "Worker.dll"]