diff --git a/http/Provision/Service/http/nginx_legacy_include.conf b/http/Provision/Service/http/nginx_legacy_include.conf
index ba4db453c069d4fec6b0c81be9bed87b6bea2724..304a0ea594be31ce9eefa933f2662542f7182a04 100644
--- a/http/Provision/Service/http/nginx_legacy_include.conf
+++ b/http/Provision/Service/http/nginx_legacy_include.conf
@@ -655,7 +655,7 @@ location ~* \.xml$ {
   error_page 405 = @drupal;
   access_log off;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 2.4";
   charset    utf-8;
   types { }
@@ -730,6 +730,7 @@ location ~ ^/(?<esi>esi/.*)"$ {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   ###
   ### Set correct, local $uri.
   ###
@@ -804,7 +805,7 @@ location @cache {
   }
   error_page 405 = @drupal;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 1.9";
   charset    utf-8;
   try_files  /cache/normal/$host${uri}_$args.html @drupal;
@@ -852,6 +853,7 @@ location = /index.php {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   tcp_nopush    off;
   keepalive_requests 0;
   try_files     $uri =404; ### check for existence of php file first
diff --git a/http/Provision/Service/http/nginx_modern_include.conf b/http/Provision/Service/http/nginx_modern_include.conf
index f1869ff8b4586196ce7de335e9aeb310c03ad413..f1b881f05ee60f8c4b660981b75f6c2b408e9e4d 100644
--- a/http/Provision/Service/http/nginx_modern_include.conf
+++ b/http/Provision/Service/http/nginx_modern_include.conf
@@ -729,7 +729,7 @@ location ~* \.xml$ {
   error_page 405 = @drupal;
   access_log off;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 2.4";
   charset    utf-8;
   types { }
@@ -804,6 +804,7 @@ location ~ ^/(?<esi>esi/.*)"$ {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   ###
   ### Set correct, local $uri.
   ###
@@ -878,7 +879,7 @@ location @cache {
   }
   error_page 405 = @drupal;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 1.9";
   charset    utf-8;
   try_files  /cache/normal/$host${uri}_$args.html @drupal;
@@ -926,6 +927,7 @@ location = /index.php {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   tcp_nopush    off;
   keepalive_requests 0;
   try_files     $uri =404; ### check for existence of php file first
diff --git a/http/Provision/Service/http/nginx_octopus_include.conf b/http/Provision/Service/http/nginx_octopus_include.conf
index 13ae15c505826f7c7971ecbe7dac2e8b39078c8a..ae63bad397879d43b65ca9e356869dd42d915205 100644
--- a/http/Provision/Service/http/nginx_octopus_include.conf
+++ b/http/Provision/Service/http/nginx_octopus_include.conf
@@ -716,7 +716,7 @@ location ~* \.xml$ {
   error_page 405 = @drupal;
   access_log off;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 2.4";
   charset    utf-8;
   types { }
@@ -791,6 +791,7 @@ location ~ ^/(?<esi>esi/.*)"$ {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   ###
   ### Set correct, local $uri.
   ###
@@ -865,7 +866,7 @@ location @cache {
   }
   error_page 405 = @drupal;
   add_header Expires "Tue, 24 Jan 1984 08:00:00 GMT";
-  add_header Cache-Control "must-revalidate, post-check=0, pre-check=0";
+  add_header Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   add_header X-Header "Boost Citrus 1.9";
   charset    utf-8;
   try_files  /cache/normal/$host${uri}_$args.html @drupal;
@@ -913,6 +914,7 @@ location = /index.php {
   add_header    X-GeoIP-Country-Name "$geoip_country_name";
   add_header    X-This-Proto "$http_x_forwarded_proto";
   add_header    X-Server-Name "$server_name";
+  add_header    Cache-Control "no-store, no-cache, must-revalidate, post-check=0, pre-check=0";
   tcp_nopush    off;
   keepalive_requests 0;
   try_files     $uri =404; ### check for existence of php file first