diff --git a/build/dev/web-default-conf-cm.yaml b/build/dev/web-default-conf-cm.yaml
index 2687c2c5..9598c4a9 100644
--- a/build/dev/web-default-conf-cm.yaml
+++ b/build/dev/web-default-conf-cm.yaml
@@ -91,7 +91,7 @@ data:
         set $no_cache 0;
 
         error_page 404 /404.html;
-      	location = /404.html {
+        location = /404.html {
             root   /usr/share/nginx/subdomain/$subdomain;
             add_header Cache-Control "no-cache" always;
         }
diff --git a/build/prod/web-default-conf-cm.yaml b/build/prod/web-default-conf-cm.yaml
index 6f3a0dbe..e01029a7 100644
--- a/build/prod/web-default-conf-cm.yaml
+++ b/build/prod/web-default-conf-cm.yaml
@@ -86,6 +86,12 @@ data:
 
         #Cache everything by default
         set $no_cache 0;
+        
+        error_page 404 /404.html;
+        location = /404.html {
+            root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
+        }
 
         #Don't cache POST requests
         if ($request_method = POST)
@@ -138,6 +144,7 @@ data:
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
         }
 
         # pass the PHP scripts to FastCGI server listening on socket
diff --git a/build/qa/web-default-conf-cm.yaml b/build/qa/web-default-conf-cm.yaml
index b155f005..1db8b5a5 100644
--- a/build/qa/web-default-conf-cm.yaml
+++ b/build/qa/web-default-conf-cm.yaml
@@ -87,6 +87,12 @@ data:
         #Cache everything by default
         set $no_cache 0;
 
+        error_page 404 /404.html;
+        location = /404.html {
+            root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
+        }
+
         #Don't cache POST requests
         if ($request_method = POST)
         {
@@ -138,6 +144,7 @@ data:
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
         }
 
         # pass the PHP scripts to FastCGI server listening on socket
diff --git a/build/stage/web-default-conf-cm.yaml b/build/stage/web-default-conf-cm.yaml
index 25568f79..b252e3de 100644
--- a/build/stage/web-default-conf-cm.yaml
+++ b/build/stage/web-default-conf-cm.yaml
@@ -86,6 +86,12 @@ data:
 
         #Cache everything by default
         set $no_cache 0;
+        
+        error_page 404 /404.html;
+        location = /404.html {
+            root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
+        }
 
         #Don't cache POST requests
         if ($request_method = POST)
@@ -138,6 +144,7 @@ data:
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   /usr/share/nginx/subdomain/$subdomain;
+            add_header Cache-Control "no-cache" always;
         }
 
         # pass the PHP scripts to FastCGI server listening on socket