diff --git a/docker-compose.build.yml b/docker-compose.build.yml
new file mode 100644
index 000000000..ccfe08b3b
--- /dev/null
+++ b/docker-compose.build.yml
@@ -0,0 +1,37 @@
+version: '2'
+
+services:
+  basket.api:
+    build:
+      context: ./src/Services/Basket/Basket.API
+      dockerfile: Dockerfile
+
+  catalog.api:
+    build:
+      context: ./src/Services/Catalog/Catalog.API
+      dockerfile: Dockerfile
+
+  identity.api:
+    build:
+      context: ./src/Services/Identity/Identity.API
+      dockerfile: Dockerfile
+
+  ordering.api:
+    build:
+      context: ./src/Services/Ordering/Ordering.API
+      dockerfile: Dockerfile
+
+  webspa:
+    build:
+      context: ./src/Web/WebSPA
+      dockerfile: Dockerfile
+
+  webmvc:
+    build:
+      context: ./src/Web/WebMVC
+      dockerfile: Dockerfile
+
+  webstatus:
+    build:
+      context: ./src/Web/WebStatus
+      dockerfile: Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
index 09212da8e..7cf595130 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,6 @@ version: '2'
 services:
   basket.api:
     image: eshop/basket.api
-    build:
-      context: ./src/Services/Basket/Basket.API
-      dockerfile: Dockerfile
     depends_on:
       - basket.data
       - identity.api
@@ -13,43 +10,28 @@ services:
 
   catalog.api:
     image: eshop/catalog.api
-    build:
-      context: ./src/Services/Catalog/Catalog.API
-      dockerfile: Dockerfile
     depends_on:
       - sql.data
       - rabbitmq
 
   identity.api:
     image: eshop/identity.api
-    build:
-      context: ./src/Services/Identity/Identity.API
-      dockerfile: Dockerfile
     depends_on:
       - sql.data
 
   ordering.api:
     image: eshop/ordering.api
-    build:
-      context: ./src/Services/Ordering/Ordering.API
-      dockerfile: Dockerfile
     depends_on:
       - sql.data
 
   webspa:
     image: eshop/webspa
-    build:
-      context: ./src/Web/WebSPA
-      dockerfile: Dockerfile
     depends_on:
       - identity.api
       - basket.api
 
   webmvc:
     image: eshop/webmvc
-    build:
-      context: ./src/Web/WebMVC
-      dockerfile: Dockerfile
     depends_on:
       - catalog.api
       - ordering.api