diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 13059b7..b627f38 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,8 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\img"
+    ""
   ],
-  "SelectedNode": "\\img\\Bower_and_Gulp_setup.png",
+  "SelectedNode": "\\06.-Setting-the-Web-SPA-application-up.md",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/eShopOnContainers.wiki/v15/.suo b/.vs/eShopOnContainers.wiki/v15/.suo
index ca993f6..0c97989 100644
Binary files a/.vs/eShopOnContainers.wiki/v15/.suo and b/.vs/eShopOnContainers.wiki/v15/.suo differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index a4a609b..e238dca 100644
Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ
diff --git a/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md b/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md
index df26923..2a60dd6 100644
--- a/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md
+++ b/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md
@@ -23,7 +23,12 @@ By default, use the MASTER branch which supports .CSPROJ projects and .NET Core
 ### Approach building bits from a container instead of the local dev-machine
 The recommended approach is to build the .NET bits and Docker images by using an special build container/image that should be used either from the CLI or your CI/CD pipeline. Doing that way you'll make sure that what you run and test locally is also built the same way by your CI/CD pipleine (having the same dependencies available within the build container, etc.).
 
-The build container to use is based on the `image: microsoft/aspnetcore-build:1.0-1.1` ASP.NET Core build image which includes the .NET SDK, NPM and many other Web and ASP.NET dependencies (Gulp, Bower, etc.) to build your services and web apps.
+
+<img src="img/building-bits_from_ci_container.png">
+
+<p>
+
+The build container to use is based on the `image: microsoft/aspnetcore-build` ASP.NET Core build image which includes the .NET SDK, NPM and many other Web and ASP.NET dependencies (Gulp, Bower, etc.) to build your services and web apps.
 See building procedure below.
 
 
diff --git a/img/building-bits_from_ci_container.png b/img/building-bits_from_ci_container.png
new file mode 100644
index 0000000..99fb049
Binary files /dev/null and b/img/building-bits_from_ci_container.png differ
diff --git a/img/building-images-and-running-app-containers.png b/img/building-images-and-running-app-containers.png
new file mode 100644
index 0000000..6e51bed
Binary files /dev/null and b/img/building-images-and-running-app-containers.png differ