diff --git a/Makefile b/Makefile
index 9675078..13a5cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,11 @@ $(C_TARGETS): hello.c
 	$(STRIP) -R .comment -s '$@'
 	@if [ '$(TARGET_ARCH)' = 'amd64' ]; then \
 		mkdir -p '$(@D)/nanoserver'; \
-		'$@' | sed -e 's/an Ubuntu container/a Nano Server container/g' -e 's!ubuntu bash!microsoft/nanoserver powershell!g' > '$(@D)/nanoserver/hello.txt'; \
+		'$@' | sed \
+			-e 's/an Ubuntu container/a Windows Server container/g' \
+			-e 's!ubuntu bash!microsoft/windowsservercore powershell!g' \
+			-e 's![$$] docker!PS C:\\> docker!g' \
+			> '$(@D)/nanoserver/hello.txt'; \
 	fi
 
 .PHONY: clean
diff --git a/amd64/hello-seattle/nanoserver/hello.txt b/amd64/hello-seattle/nanoserver/hello.txt
index 956b472..5d52b8a 100644
--- a/amd64/hello-seattle/nanoserver/hello.txt
+++ b/amd64/hello-seattle/nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
  4. The Docker daemon streamed that output to the Docker client, which sent it
     to your terminal.
 
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
 
 Share images, automate workflows, and more with a free Docker ID:
  https://cloud.docker.com/
diff --git a/amd64/hello-world/nanoserver/hello.txt b/amd64/hello-world/nanoserver/hello.txt
index 90ebfb1..557042d 100644
--- a/amd64/hello-world/nanoserver/hello.txt
+++ b/amd64/hello-world/nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
  4. The Docker daemon streamed that output to the Docker client, which sent it
     to your terminal.
 
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
 
 Share images, automate workflows, and more with a free Docker ID:
  https://cloud.docker.com/
diff --git a/amd64/hola-mundo/nanoserver/hello.txt b/amd64/hola-mundo/nanoserver/hello.txt
index cb56b4a..a8b9086 100644
--- a/amd64/hola-mundo/nanoserver/hello.txt
+++ b/amd64/hola-mundo/nanoserver/hello.txt
@@ -10,8 +10,8 @@ To generate this message, Docker took the following steps:
  4. The Docker daemon streamed that output to the Docker client, which sent it
     to your terminal.
 
-To try something more ambitious, you can run a Nano Server container with:
- $ docker run -it microsoft/nanoserver powershell
+To try something more ambitious, you can run a Windows Server container with:
+ PS C:\> docker run -it microsoft/windowsservercore powershell
 
 Share images, automate workflows, and more with a free Docker ID:
  https://cloud.docker.com/