diff --git a/docker-compose.yaml b/docker-compose.yaml
index f8386b0..4e00b37 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,7 +11,7 @@ services:
             - "8443:443"
         volumes:
             - caddy_data:/data
-            - ./caddy/${COMPOSE_PROFILES}:/etc/caddy
+            - ./env/${COMPOSE_PROFILES}/caddy:/etc/caddy
             - static_files:/var/www/static:ro
         restart: unless-stopped
         labels:
diff --git a/caddy/development/Caddyfile b/env/development/caddy/Caddyfile
similarity index 91%
rename from caddy/development/Caddyfile
rename to env/development/caddy/Caddyfile
index 562f78c..e7e7be4 100644
--- a/caddy/development/Caddyfile
+++ b/env/development/caddy/Caddyfile
@@ -8,6 +8,9 @@ localhost {
         file_server
     }
 
+    handle_path /oauth* {
+    }
+
 	reverse_proxy invenio-rdm:5000 {
 		header_down Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
 		header_down Pragma "no-cache"
diff --git a/caddy/production/Caddyfile b/env/production/caddy/Caddyfile
similarity index 100%
rename from caddy/production/Caddyfile
rename to env/production/caddy/Caddyfile