diff --git a/.env.example b/.env.example
index 8e554f8..030f502 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,10 @@
 # À définir pour éviter les problèmes sur les multi-projets Docker
 COMPOSE_PROJECT_NAME=""
 
-COMPOSE_FILE=docker-compose.yml
+COMPOSE_FILE=docker/docker-compose.yml
 
 # Pour utiliser Let's Encrypt :
-# COMPOSE_FILE=docker-compose.yml:docker-compose.lets-encrypt.yml
+# COMPOSE_FILE=docker/docker-compose.yml:docker/docker-compose.lets-encrypt.yml
 
 # Préfixe pour les noms des conteneurs et des labels dans les fichiers docker-compose
 CONTAINER_PREFIX=""
diff --git a/docker-compose.apache-php.yml b/docker-compose.apache-php.yml
deleted file mode 100644
index 1e44bd4..0000000
--- a/docker-compose.apache-php.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
-
-  server-php:
-    image: ${APACHE_PHP_VERSION}
-    
-    environment:
-      - APACHE_ADMIN_EMAIL=${APACHE_ADMIN_EMAIL}
-
-    volumes:
-      - ./www:/var/www/html
-      - ./host/apache/logs:/var/log/apache2
-      - ./host/apache/conf/vhost.conf:/etc/apache2/sites-available/000-default.conf
-      - ./host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf
\ No newline at end of file
diff --git a/docker/docker-compose.apache-php.yml b/docker/docker-compose.apache-php.yml
new file mode 100644
index 0000000..a9b20af
--- /dev/null
+++ b/docker/docker-compose.apache-php.yml
@@ -0,0 +1,13 @@
+services:
+
+  server-php:
+    image: ${APACHE_PHP_VERSION}
+    
+    environment:
+      - APACHE_ADMIN_EMAIL=${APACHE_ADMIN_EMAIL}
+
+    volumes:
+      - ${PWD}/www:/var/www/html
+      - ${PWD}/host/apache/logs:/var/log/apache2
+      - ${PWD}/host/apache/conf/vhost.conf:/etc/apache2/sites-available/000-default.conf
+      - ${PWD}/host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker/docker-compose.dev.yml
similarity index 100%
rename from docker-compose.dev.yml
rename to docker/docker-compose.dev.yml
diff --git a/docker-compose.frankenphp.yml b/docker/docker-compose.frankenphp.yml
similarity index 61%
rename from docker-compose.frankenphp.yml
rename to docker/docker-compose.frankenphp.yml
index 918d658..1aad9cc 100644
--- a/docker-compose.frankenphp.yml
+++ b/docker/docker-compose.frankenphp.yml
@@ -5,7 +5,7 @@ services:
       context: .
       args:
         FRANKENPHP_IMAGE: ${FRANKENPHP_VERSION}
-      dockerfile: docker/Dockerfile.frankenphp
+      dockerfile: ${PWD}/docker/Dockerfile.frankenphp
 
     environment:
       FRANKENPHP_ROOT_PATH: ${FRANKENPHP_ROOT_PATH}
@@ -13,10 +13,10 @@ services:
       VITE_PORT: ${VITE_PORT}
 
     volumes:
-      - ./www:/app
-      - ./host/frankenphp/conf/Caddyfile:/etc/frankenphp/Caddyfile
-      - ./host/php/conf/${OPCACHE_CONFIG_FILE:-opcache.default.ini}:/usr/local/etc/php/conf.d/opcache.ini
-      - ./upload:/app/public/upload
+      - ${PWD}/www:/app
+      - ${PWD}/host/frankenphp/conf/Caddyfile:/etc/frankenphp/Caddyfile
+      - ${PWD}/host/php/conf/${OPCACHE_CONFIG_FILE:-opcache.default.ini}:/usr/local/etc/php/conf.d/opcache.ini
+      - ${PWD}/upload:/app/public/upload
 
     user: "${UID:-1000}:${GID:-1000}"
 
diff --git a/docker-compose.lets-encrypt.yml b/docker/docker-compose.lets-encrypt.yml
similarity index 61%
rename from docker-compose.lets-encrypt.yml
rename to docker/docker-compose.lets-encrypt.yml
index e972466..59d646e 100644
--- a/docker-compose.lets-encrypt.yml
+++ b/docker/docker-compose.lets-encrypt.yml
@@ -6,12 +6,12 @@ services:
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
     volumes:
-      - ./certs/letsencrypt:/letsencrypt
+      - ${PWD}/certs/letsencrypt:/letsencrypt
 
   server-php:
     labels:
-      - "traefik.http.routers.${CONTAINER_PREFIX}_server_php.tls.certresolver=letsencrypt"
+      - traefik.http.routers.${CONTAINER_PREFIX}_server_php.tls.certresolver=letsencrypt
 
   phpmyadmin:
     labels:
-      - "traefik.http.routers.${CONTAINER_PREFIX}_pma.tls.certresolver=letsencrypt"
+      - traefik.http.routers.${CONTAINER_PREFIX}_pma.tls.certresolver=letsencrypt
diff --git a/docker-compose.mailhog.yml b/docker/docker-compose.mailhog.yml
similarity index 81%
rename from docker-compose.mailhog.yml
rename to docker/docker-compose.mailhog.yml
index cd15fc1..0d3d76c 100644
--- a/docker-compose.mailhog.yml
+++ b/docker/docker-compose.mailhog.yml
@@ -10,6 +10,6 @@ services:
       - traefik.enable=true
       - traefik.http.routers.${CONTAINER_PREFIX}_mailhog.rule=Host(`${MAILHOG_URL}`)
       - traefik.http.routers.${CONTAINER_PREFIX}_mailhog.entrypoints=websecure
-      - "traefik.http.services.${CONTAINER_PREFIX}_mailhog.loadbalancer.server.port=8025"
+      - traefik.http.services.${CONTAINER_PREFIX}_mailhog.loadbalancer.server.port=8025
     networks:
       - frontend
\ No newline at end of file
diff --git a/docker-compose.upload.yml b/docker/docker-compose.upload.yml
similarity index 92%
rename from docker-compose.upload.yml
rename to docker/docker-compose.upload.yml
index 270288c..7e5d03f 100644
--- a/docker-compose.upload.yml
+++ b/docker/docker-compose.upload.yml
@@ -5,7 +5,7 @@ services:
     container_name: ${CONTAINER_PREFIX}_uploads
     restart: unless-stopped
     volumes:
-      - ./upload:/usr/share/nginx/html:ro
+      - ${PWD}/upload:/usr/share/nginx/html:ro
     labels:
       - traefik.enable=true
       - traefik.docker.network=frontend
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 88%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 3880fe1..23b46da 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -13,11 +13,11 @@ services:
     image: ${DATABASE_IMAGE}
     volumes:
       # Données
-      - ./host/database/data:/var/lib/mysql
-      - ./host/database/sql:/sql
-      - ./host/database/backups:/backups
+      - ${PWD}/host/database/data:/var/lib/mysql
+      - ${PWD}/host/database/sql:/sql
+      - ${PWD}/host/database/backups:/backups
       # Configuration
-      - ./host/database/conf/my.cnf:/etc/mysql/mariadb.conf.d/my.cnf
+      - ${PWD}/host/database/conf/my.cnf:/etc/mysql/mariadb.conf.d/my.cnf
     environment:
       MARIADB_ROOT_PASSWORD: ${DATABASE_ROOT_PASSWORD}
     networks: