diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 08785cff1..f71be6069 100644
--- a/docker-compose-windows.yml
+++ b/docker-compose-windows.yml
@@ -4,8 +4,8 @@ services:
   basket.api:
     image: eshop/basket.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Basket/Basket.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Basket/Basket.API/Dockerfile
     depends_on:
       - basket.data
       - identity.api
@@ -14,8 +14,8 @@ services:
   catalog.api:
     image: eshop/catalog.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Catalog/Catalog.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Catalog/Catalog.API/Dockerfile
     depends_on:
       - sql.data
       - rabbitmq
@@ -23,16 +23,16 @@ services:
   identity.api:
     image: eshop/identity.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Identity/Identity.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Identity/Identity.API/Dockerfile
     depends_on:
       - sql.data
 
   ordering.api:
     image: eshop/ordering.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Ordering/Ordering.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Ordering/Ordering.API/Dockerfile
     depends_on:
       - sql.data
       - rabbitmq
@@ -40,19 +40,19 @@ services:
   marketing.api:
     image: eshop/marketing.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Marketing/Marketing.API
-      dockerfile: Dockerfile    
+      context: .
+      dockerfile: ./src/Services/Marketing/Marketing.API/Dockerfile    
     depends_on:
       - sql.data
       - nosql.data
       - identity.api
-      - rabbitmq      
+      - rabbitmq
 
   webspa:
     image: eshop/webspa-win:${TAG:-latest}
     build:
-      context: ./src/Web/WebSPA
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Web/WebSPA/Dockerfile
     depends_on:
       - catalog.api
       - ordering.api
@@ -75,22 +75,22 @@ services:
   webstatus:
     image: eshop/webstatus-win:${TAG:-latest}
     build:
-      context: ./src/Web/WebStatus
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Web/WebStatus/Dockerfile
 
   payment.api:
     image: eshop/payment.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Payment/Payment.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Payment/Payment.API/Dockerfile
     depends_on:
-      - rabbitmq         
+      - rabbitmq
 
   locations.api:
     image: eshop/locations.api-win:${TAG:-latest}
     build:
-      context: ./src/Services/Location/Locations.API
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ./src/Services/Location/Locations.API/Dockerfile
     depends_on:
       - nosql.data
       - rabbitmq