diff --git a/88-tar1090.conf b/88-tar1090.conf
index 1c2f343..eb9e018 100644
--- a/88-tar1090.conf
+++ b/88-tar1090.conf
@@ -17,10 +17,16 @@ alias.url += (
 $HTTP["url"] =~ "^/INSTANCE/data/.*\.binCraft$" {
     compress.filetype = ()
     setenv.add-response-header += (
-        "Cache-Control" => "no-cache",
+        "Cache-Control" => "public, no-cache",
         "Content-Encoding" => "gzip",
         )
 }
+$HTTP["url"] =~ "^/INSTANCE/data/.*\.zst$" {
+    compress.filetype = ()
+    setenv.add-response-header += (
+        "Cache-Control" => "public, no-cache",
+        )
+}
 $HTTP["url"] =~ "^/INSTANCE/chunks/chunk_.*gz$" {
     setenv.add-response-header += (
         "Access-Control-Allow-Origin" => "*",
@@ -32,25 +38,25 @@ $HTTP["url"] =~ "^/INSTANCE/chunks/chunk_.*gz$" {
 $HTTP["url"] =~ "^/INSTANCE/chunks/current_.*gz$" {
     setenv.add-response-header += (
         "Access-Control-Allow-Origin" => "*",
-        "Cache-Control" => "public, max-age=0",
+        "Cache-Control" => "public, no-cache",
         "Content-Encoding" => "gzip",
         "Content-Type" => "application/json",
         )
 }
 $HTTP["url"] =~ "^/INSTANCE/chunks/978\.json$" {
     setenv.add-response-header += (
-        "Cache-Control" => "public, max-age=0",
+        "Cache-Control" => "public, no-cache",
         )
 }
 $HTTP["url"] =~ "^/INSTANCE/data/aircraft\.json$" {
     setenv.add-response-header += (
-        "Cache-Control" => "public, max-age=0",
+        "Cache-Control" => "public, no-cache",
         )
 }
 $HTTP["url"] =~ "^/INSTANCE/data/globe.*" {
     compress.filetype = ()
     setenv.add-response-header += (
-        "Cache-Control" => "public, max-age=0",
+        "Cache-Control" => "public, no-cache",
         "Content-Encoding" => "gzip",
         )
 }
diff --git a/nginx.conf b/nginx.conf
index 571e80c..644d411 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -29,6 +29,10 @@ location /INSTANCE/data/ {
     add_header Cache-Control "public, no-cache";
     add_header Content-Encoding "gzip";
   }
+  location ~ .*\.zst$ {
+    gzip off;
+    add_header Cache-Control "public, no-cache";
+  }
 }
 
 location /INSTANCE/osm_tiles_offline/ {
@@ -101,12 +105,12 @@ location /INSTANCE {
 
   # exact matches
   location = /INSTANCE/config.js {
-    add_header Cache-Control "public, max-age=0";
+    add_header Cache-Control "public, no-cache";
     gzip on;
     gzip_static on;
   }
   location = /INSTANCE/index.html {
-    add_header Cache-Control "public, max-age=0";
+    add_header Cache-Control "public, no-cache";
     gzip on;
     gzip_static on;
   }