diff --git a/.gitignore b/.gitignore
index f733c4b..2171176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 config/
+data/
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fcd52c..0f94455 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
         image: 1337kavin/piped:latest
         restart: unless-stopped
         volumes:
-            - ./config/config.properties:/app/config.properties
+            - ./config/config.properties:/app/config.properties:ro
         depends_on:
             - ytproxy
             - postgres
@@ -24,8 +24,10 @@ services:
         image: varnish:6.6-alpine
         restart: unless-stopped
         volumes:
-            - ./config/default.vcl:/etc/varnish/default.vcl
+            - ./config/default.vcl:/etc/varnish/default.vcl:ro
         container_name: varnish
+        depends_on:
+            - piped
     caddy:
         image: caddy:2-alpine
         restart: unless-stopped
@@ -33,9 +35,8 @@ services:
             - "80:80"
             - "443:443"
         volumes:
-            - ./config/Caddyfile:/etc/caddy/Caddyfile
+            - ./config/Caddyfile:/etc/caddy/Caddyfile:ro
             - caddy_data:/data
-            - caddy_config:/config
             - ytproxy:/var/run/ytproxy
         container_name: caddy
     postgres:
@@ -61,5 +62,4 @@ services:
         command: piped-frontend piped-backend ytproxy varnish caddy postgres watchtower
 volumes:
     caddy_data:
-    caddy_config:
     ytproxy:
diff --git a/template/Caddyfile b/template/Caddyfile
index bc4d3af..e122507 100644
--- a/template/Caddyfile
+++ b/template/Caddyfile
@@ -9,9 +9,6 @@ BACKEND_HOSTNAME {
 
 PROXY_HOSTNAME {
 
-  header_upstream -CF-Connecting-IP
-  header_upstream -X-Forwarded-For
-
   @ytproxy path /videoplayback* /api/v4/* /api/manifest/*
 
   @optionscall {
@@ -29,12 +26,14 @@ PROXY_HOSTNAME {
 
     header / {
       Cache-Control "public, max-age=604800"
-      -Access-Control-Allow-Origin
     }
 
     respond @optionscall 200
 
     reverse_proxy unix//var/run/ytproxy/http-proxy.sock {
+      header_up -CF-Connecting-IP
+      header_up -X-Forwarded-For
+      header_down -Access-Control-Allow-Origin
       header_down -etag
       header_down -alt-svc
     }