diff --git a/build-images.ps1 b/build-images.ps1
index 2cd2ac1a6..3a33a6ee7 100644
--- a/build-images.ps1
+++ b/build-images.ps1
@@ -82,15 +82,14 @@ $imagesToDelete = docker images --filter=reference="eshop/*" -q
 If (-Not $imagesToDelete) {Write-Host "Not deleting eShop images as there are no eShop images in the current local Docker repo."} 
 Else 
 {
-    # Delete all eshop containers
-    Write-Host "Deleting eShop containers in local Docker Host"
-    docker rm $($imagesToDelete) -f
-    #docker rm $(docker images --filter=reference="eshop/*" -q) -f
+    # Delete all containers
+    Write-Host "Deleting all containers in local Docker Host"
+    docker rm $(docker ps -a -q) -f
     
     # Delete all eshop images
     Write-Host "Deleting eShop images in local Docker repo"
-    docker rm $($imagesToDelete) -f
-    #docker rmi $(docker images --filter=reference="eshop/*" -q)
+    Write-Host $imagesToDelete
+    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
 }
 
 #*** build docker images ***
diff --git a/delete-images.ps1 b/delete-images.ps1
new file mode 100644
index 000000000..9167eec91
--- /dev/null
+++ b/delete-images.ps1
@@ -0,0 +1,28 @@
+$scriptPath = Split-Path $script:MyInvocation.MyCommand.Path
+ 
+Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow
+
+$imagesToDelete = docker images --filter=reference="eshop/*" -q
+
+If (-Not $imagesToDelete) {Write-Host "Not deleting eShop images as there are no eShop images in the current local Docker repo."} 
+Else 
+{
+    # Delete all containers
+    Write-Host "Deleting all containers in local Docker Host"
+    docker rm $(docker ps -a -q) -f
+    
+    # Delete all eshop images
+    Write-Host "Deleting eShop images in local Docker repo"
+    Write-Host $imagesToDelete
+    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+}
+
+
+# DELETE ALL IMAGES AND CONTAINERS
+
+# Delete all containers
+# docker rm $(docker ps -a -q) -f
+
+# Delete all images
+# docker rmi $(docker images -q)
+
diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml
index 7a43e4364..4d6571e99 100644
--- a/docker-compose.vs.debug.yml
+++ b/docker-compose.vs.debug.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   basket.api:
-    image: basket.api:dev
+    image: eshop/basket.api:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
@@ -17,7 +17,7 @@ services:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   catalog.api:
-    image: catalog.api:dev
+    image: eshop/catalog.api:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
@@ -32,7 +32,7 @@ services:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   identity.api:
-    image: identity.api:dev
+    image: eshop/identity.api:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
@@ -47,7 +47,7 @@ services:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   ordering.api:
-    image: ordering.api:dev
+    image: eshop/ordering.api:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
@@ -62,7 +62,7 @@ services:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   eshoponcontainers.webspa:
-    image: eshoponcontainers.webspa:dev
+    image: eshop/eshoponcontainers.webspa:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
@@ -77,7 +77,7 @@ services:
       - "com.microsoft.visualstudio.targetoperatingsystem=linux"
 
   webmvc:
-    image: webmvc:dev
+    image: eshop/webmvc:dev
     build:
       args:
         source: ${DOCKER_BUILD_SOURCE}
diff --git a/docker-compose.yml b/docker-compose.yml
index 094e9e2c8..4e353f0b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   basket.api:
-    image: basket.api
+    image: eshop/basket.api
     build:
       context: ./src/Services/Basket/Basket.API
       dockerfile: Dockerfile
@@ -11,7 +11,7 @@ services:
       - identity.api
 
   catalog.api:
-    image: catalog.api
+    image: eshop/catalog.api
     build:
       context: ./src/Services/Catalog/Catalog.API
       dockerfile: Dockerfile
@@ -19,7 +19,7 @@ services:
       - sql.data
 
   identity.api:
-    image: identity.api
+    image: eshop/identity.api
     build:
       context: ./src/Services/Identity/Identity.API
       dockerfile: Dockerfile
@@ -27,7 +27,7 @@ services:
       - sql.data
 
   ordering.api:
-    image: ordering.api
+    image: eshop/ordering.api
     build:
       context: ./src/Services/Ordering/Ordering.API
       dockerfile: Dockerfile
@@ -35,7 +35,7 @@ services:
       - sql.data
 
   eshoponcontainers.webspa:
-    image: eshoponcontainers.webspa
+    image: eshop/eshoponcontainers.webspa
     build:
       context: ./src/Web/WebSPA/eShopOnContainers.WebSPA
       dockerfile: Dockerfile
@@ -44,7 +44,7 @@ services:
       - basket.api
 
   webmvc:
-    image: webmvc
+    image: eshop/webmvc
     build:
       context: ./src/Web/WebMVC
       dockerfile: Dockerfile