diff --git a/README.md b/README.md
index 17367a4a0..9bc5938fe 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ services:
   tubesync:
     image: ghcr.io/meeb/tubesync:latest
     container_name: tubesync
-    restart: unless-stopped
+    restart: on-failure:3
     ports:
       - 4848:4848
     volumes:
diff --git a/config/root/etc/nginx/nginx.conf b/config/root/etc/nginx/nginx.conf
index e6b99b682..6618aed9c 100644
--- a/config/root/etc/nginx/nginx.conf
+++ b/config/root/etc/nginx/nginx.conf
@@ -37,8 +37,8 @@ http {
 
     # Logging
     log_format host '$remote_addr - $remote_user [$time_local] "[$host] $request" $status $bytes_sent "$http_referer" "$http_user_agent" "$gzip_ratio"';
-    access_log /dev/stdout;
-    error_log stderr;
+    access_log /config/log/nginx/access.log.gz combined gzip=9 flush=1m;
+    error_log /config/log/nginx/error.log info;
 
     # GZIP
     gzip on;
diff --git a/config/root/etc/s6-overlay/s6-rc.d/tubesync-init/run b/config/root/etc/s6-overlay/s6-rc.d/tubesync-init/run
index ff0d4d555..6b704b685 100755
--- a/config/root/etc/s6-overlay/s6-rc.d/tubesync-init/run
+++ b/config/root/etc/s6-overlay/s6-rc.d/tubesync-init/run
@@ -25,6 +25,21 @@ then
     chmod -R 0755 /downloads
 fi
 
+# Prepare for nginx logging into /config/log/nginx
+mkdir -p /config/log
+rm -rf /config/log/nginx.9
+for n in $(seq 8 -1 0)
+do
+    test '!' -d "/config/log/nginx.${n}" ||
+    mv "/config/log/nginx.${n}" "/config/log/nginx.$((1 + n))"
+done ; unset -v n ;
+rm -rf /config/log/nginx.0
+test '!' -d /config/log/nginx ||
+mv /config/log/nginx /config/log/nginx.0
+rm -rf /config/log/nginx
+cp -a /var/log/nginx /config/log/
+cp -p /config/log/nginx/access.log /config/log/nginx/access.log.gz
+
 # Run migrations
 exec s6-setuidgid app \
     /usr/bin/python3 /app/manage.py migrate