diff --git a/docker-compose.yml b/docker-compose.yml
index a6d3062..badfdfe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     volumes:
       - ./data/mariadb/lib:/var/lib/mysql
       - ./data/mariadb/conf.d:/etc/mysql/conf.d
-      - ./data/mariadb/logs:/var/log/mysql
+      - ./data/logs/mariadb:/var/log/mysql
       - ./docker/mariadb/my.cnf:/etc/mysql/conf.d/custom.cnf
     ports:
       - "3306:3306"
@@ -24,12 +24,13 @@ services:
       dockerfile: Dockerfile
     container_name: ${APP_NAME}_app
     volumes:
-      - ./data:/var/www
+      - ./data/html:/var/www/html
+      - ./data/logs/php:/var/www/logs
     depends_on:
       - mariadb
     environment:
       REPO_URL: ${REPO_URL}
-      BRANCH: ${REPO_BRANCH:-main}
+      BRANCH: ${REPO_BRANCH}
       APP_NAME: ${APP_NAME}
       APP_URL: ${APP_URL}
       DB_HOST: ${DB_HOST}
@@ -48,7 +49,7 @@ services:
     volumes:
       - ./data/html:/var/www/html
       - ./data/nginx/conf.d/:/etc/nginx/conf.d/
-      - ./data/nginx/logs/:/var/log/nginx
+      - ./data/logs/nginx/:/var/log/nginx
       - ./docker/nginx/:/etc/nginx/templates
     depends_on:
       - app