diff --git a/.gitignore b/.gitignore
index 29eb863..c6362d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,9 @@ dist-ssr
 # Local Caddy config (use Caddyfile.example as template)
 Caddyfile
 
+# Caddy data and certificates
+caddy/
+
 # Authentik volumes (keep structure, ignore data)
 authentik/media/*
 !authentik/media/.gitkeep
diff --git a/docker-compose.caddy.yml b/docker-compose.caddy.yml
index b3a90af..a79fb70 100644
--- a/docker-compose.caddy.yml
+++ b/docker-compose.caddy.yml
@@ -23,14 +23,10 @@ services:
     volumes:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
       - ./dist:/srv/frontend:ro
-      - caddy-data:/data
-      - caddy-config:/config
+      - ./caddy/data:/data
+      - ./caddy/config:/config
     depends_on:
       - kaboot-backend
       - authentik-server
     networks:
       - kaboot-network
-
-volumes:
-  caddy-data:
-  caddy-config: