diff --git a/deploy.sh b/deploy.sh
index acdc73f..0b1a7b7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -63,10 +63,12 @@ if [ "$GREENFIELD" = true ]; then
     mkdir -p "$TARGET_DIR/config/authelia"
     mkdir -p "$TARGET_DIR/data/caddy"
     mkdir -p "$TARGET_DIR/data/authelia"
-    mkdir -p "$TARGET_DIR/compose"
     mkdir -p "$TARGET_DIR/www"
     mkdir -p "$TARGET_DIR/config/nextworkspace"
-    mkdir -p "$TARGET_DIR/logs"
+    mkdir -p "$TARGET_DIR/logs/caddy"
+    # Ensure data dirs are owned by the runtime user
+    chown -R master:master "$TARGET_DIR/data/caddy" 2>/dev/null || true
+    chown -R master:master "$TARGET_DIR/logs/caddy" 2>/dev/null || true
 
     # Copy .env from backup
     if [ -f "$BACKUP_DIR/.env" ]; then