diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index b42c4fabceb050db14651b0962af6fc74983db07..9413e8b315fa590348a921569480ddcfa32b832b
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,25 +1,53 @@
-version: '3.3'
+version: "3.3"
 services:
-  web:
-    image: tubes-1:latest
+  cooklyst-app-web:
+    image: tubes-2-wbd-app:latest
     ports:
-      - 8008:80
-    hostname: web-tubes-1
+      - "8008:80"
+    hostname: cooklyst-app-web
     env_file: ./src/.env
     volumes:
       - ./src:/var/www/html
     depends_on:
-      - mysql
-  mysql:
+      cooklyst-app-db:
+        condition: service_healthy
+
+    # COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
+    networks:
+      - app-mysql
+
+  cooklyst-app-db:
     image: mysql:latest
     ports:
       - 3307:3306
-    hostname: db-tubes-1
+    hostname: cooklyst-app-db
     env_file: ./src/.env
     volumes:
       - ./mysql:/var/lib/mysql
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-u",
+          "root",
+          "-p$$MYSQL_ROOT_PASSWORD",
+        ]
+      interval: 10s
+      timeout: 3s
+      retries: 5
+
+    # COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
+    networks:
+      - app-mysql
+
     command:
-        - '--skip-log-bin'
+      - "--skip-log-bin"
+
+# COMMENT THIS IF YOU USE DOCKER CONFIG TO START ALL CONTAINERS
 networks:
-  web-mysql:
+  app-mysql:
     driver: bridge
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index ce096bac1ad2e7c6eec731197a2b126c245fa237..b21b8e1ff2e0f2f1bb6ca3ce5c8453297736d78f 100644
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -1 +1 @@
-docker build -t tubes-1:latest .
\ No newline at end of file
+docker build -t tubes-2-wbd-app:latest .
diff --git a/src/.env.example b/src/.env.example
index 8848bda1588bcf0a98747f9dd1d81703553c2b61..32837b7dfa4f5aa93b2f7be05be60f5e2de3c1dd 100644
--- a/src/.env.example
+++ b/src/.env.example
@@ -1,7 +1,7 @@
 # DATABASE
 # root password cannot be empty
 MYSQL_ROOT_PASSWORD=
-MYSQL_HOST=
+MYSQL_HOST=cooklyst-app-db
 MYSQL_DATABASE=
 MYSQL_USER=
 MYSQL_PASSWORD=