diff --git a/src/Services/Basket/Basket.API/Dockerfile.nanowin b/src/Services/Basket/Basket.API/Dockerfile.nanowin
index 9c664f4e4..deab637ef 100644
--- a/src/Services/Basket/Basket.API/Dockerfile.nanowin
+++ b/src/Services/Basket/Basket.API/Dockerfile.nanowin
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
diff --git a/src/Services/Catalog/Catalog.API/Dockerfile.nanowin b/src/Services/Catalog/Catalog.API/Dockerfile.nanowin
index 193ddaef6..68eb9262d 100644
--- a/src/Services/Catalog/Catalog.API/Dockerfile.nanowin
+++ b/src/Services/Catalog/Catalog.API/Dockerfile.nanowin
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver 
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
diff --git a/src/Services/Location/Locations.API/Dockerfile.nanowin b/src/Services/Location/Locations.API/Dockerfile.nanowin
index 9c664f4e4..59fe001da 100644
--- a/src/Services/Location/Locations.API/Dockerfile.nanowin
+++ b/src/Services/Location/Locations.API/Dockerfile.nanowin
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
 RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
 EXPOSE 80
 COPY ${source:-obj/Docker/publish} .
-ENTRYPOINT ["dotnet", "Basket.API.dll"]
+ENTRYPOINT ["dotnet", "Locations.API.dll"]
diff --git a/src/Services/Marketing/Marketing.API/Dockerfile.nanowin b/src/Services/Marketing/Marketing.API/Dockerfile.nanowin
index 9c664f4e4..33bcd0e82 100644
--- a/src/Services/Marketing/Marketing.API/Dockerfile.nanowin
+++ b/src/Services/Marketing/Marketing.API/Dockerfile.nanowin
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
 RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
 EXPOSE 80
 COPY ${source:-obj/Docker/publish} .
-ENTRYPOINT ["dotnet", "Basket.API.dll"]
+ENTRYPOINT ["dotnet", "Marketing.API.dll"]
diff --git a/src/Services/Ordering/Ordering.API/Dockerfile.nanowin b/src/Services/Ordering/Ordering.API/Dockerfile.nanowin
index 653531d0f..c5dd08a2e 100644
--- a/src/Services/Ordering/Ordering.API/Dockerfile.nanowin
+++ b/src/Services/Ordering/Ordering.API/Dockerfile.nanowin
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
diff --git a/src/Services/Payment/Payment.API/Dockerfile.nanowin b/src/Services/Payment/Payment.API/Dockerfile.nanowin
index 9c664f4e4..c04327048 100644
--- a/src/Services/Payment/Payment.API/Dockerfile.nanowin
+++ b/src/Services/Payment/Payment.API/Dockerfile.nanowin
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
 RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
 EXPOSE 80
 COPY ${source:-obj/Docker/publish} .
-ENTRYPOINT ["dotnet", "Basket.API.dll"]
+ENTRYPOINT ["dotnet", "Payment.API.dll"]
diff --git a/src/Web/WebMVC/Dockerfile.nanowin b/src/Web/WebMVC/Dockerfile.nanowin
index 4eaad3b22..739f27746 100644
--- a/src/Web/WebMVC/Dockerfile.nanowin
+++ b/src/Web/WebMVC/Dockerfile.nanowin
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
diff --git a/src/Web/WebSPA/Dockerfile.nanowin b/src/Web/WebSPA/Dockerfile.nanowin
index 700c23391..7e678c9ac 100644
--- a/src/Web/WebSPA/Dockerfile.nanowin
+++ b/src/Web/WebSPA/Dockerfile.nanowin
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
diff --git a/src/Web/WebStatus/Dockerfile.nanowin b/src/Web/WebStatus/Dockerfile.nanowin
index 4eaad3b22..9405cf26d 100644
--- a/src/Web/WebStatus/Dockerfile.nanowin
+++ b/src/Web/WebStatus/Dockerfile.nanowin
@@ -1,8 +1,8 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
+FROM microsoft/dotnet:2.0-runtime-nanoserver
 SHELL ["powershell"]
 ARG source
 WORKDIR /app
 RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
 EXPOSE 80
 COPY ${source:-obj/Docker/publish} .
-ENTRYPOINT ["dotnet", "WebMVC.dll"]
+ENTRYPOINT ["dotnet", "WebStatus.dll"]