diff --git a/docker-compose.yml b/docker-compose.yml
index b9990412a..cdce76d26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,32 +1,43 @@
-version: "3"
+version: '3.2'
 
 services:
-  app:
-    build: docker/php
+
+  frontend:
+    build: frontend
+    ports:
+      - 20080:80
     volumes:
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
       - ./:/app
     depends_on:
       - db
       - mailcatcher
-    env_file:
-      - .env
 
-  webpacker:
-    image: node:9-alpine
-    working_dir: /app
+  backend:
+    build: backend
+    ports:
+      - 21080:80
     volumes:
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
       - ./:/app
-    command: /bin/true
+    depends_on:
+      - db
+      - mailcatcher
 
-  nginx:
-    image: nginx:1.12-alpine
+  storage:
+    build: storage
     ports:
-      - 80:80
+      - 22080:80
     volumes:
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
       - ./:/app
-      - ./docker/nginx/vhost.conf:/etc/nginx/conf.d/vhost.conf
-    depends_on:
-      - app
+
+  webpacker:
+    image: node:9-alpine
+    working_dir: /app
+    volumes:
+      - ./:/app
+    command: /bin/true
 
   mailcatcher:
     image: schickling/mailcatcher:latest
@@ -34,7 +45,7 @@ services:
       - 1080:1080
 
   db:
-    image: mysql:5.7
+    image: mysql:5.8
     volumes:
       - /var/lib/mysql
       - ./docker/mysql/config.cnf:/etc/mysql/conf.d/config.cnf