diff --git a/salt/nginx/etc/nginx.conf.so-eval b/salt/nginx/etc/nginx.conf.so-eval
index e2615808f..61d91ba20 100644
--- a/salt/nginx/etc/nginx.conf.so-eval
+++ b/salt/nginx/etc/nginx.conf.so-eval
@@ -299,12 +299,12 @@ http {
           return        302 /auth/self-service/browser/flows/login;
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /usr/share/nginx/html/40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-fleet b/salt/nginx/etc/nginx.conf.so-fleet
index a97b85e78..28372f448 100644
--- a/salt/nginx/etc/nginx.conf.so-fleet
+++ b/salt/nginx/etc/nginx.conf.so-fleet
@@ -86,12 +86,12 @@ http {
 
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-heavynode b/salt/nginx/etc/nginx.conf.so-heavynode
index 39688f3df..f3fc913de 100644
--- a/salt/nginx/etc/nginx.conf.so-heavynode
+++ b/salt/nginx/etc/nginx.conf.so-heavynode
@@ -77,12 +77,12 @@ http {
 #        location / {
 #        }
 #
-#        error_page 404 /404.html;
-#            location = /40x.html {
-#        }
+#        #error_page 404 /404.html;
+#        #    location = /40x.html {
+#        #}
 #
 #        error_page 500 502 503 504 /50x.html;
-#            location = /50x.html {
+#            location = /usr/share/nginx/html/50x.html {
 #        }
 #    }
 
diff --git a/salt/nginx/etc/nginx.conf.so-helix b/salt/nginx/etc/nginx.conf.so-helix
index 39688f3df..e5a68c09d 100644
--- a/salt/nginx/etc/nginx.conf.so-helix
+++ b/salt/nginx/etc/nginx.conf.so-helix
@@ -47,12 +47,12 @@ http {
         location / {
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-master b/salt/nginx/etc/nginx.conf.so-master
index e2615808f..46e910a17 100644
--- a/salt/nginx/etc/nginx.conf.so-master
+++ b/salt/nginx/etc/nginx.conf.so-master
@@ -299,12 +299,12 @@ http {
           return        302 /auth/self-service/browser/flows/login;
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-mastersearch b/salt/nginx/etc/nginx.conf.so-mastersearch
index e2615808f..46e910a17 100644
--- a/salt/nginx/etc/nginx.conf.so-mastersearch
+++ b/salt/nginx/etc/nginx.conf.so-mastersearch
@@ -299,12 +299,12 @@ http {
           return        302 /auth/self-service/browser/flows/login;
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-node b/salt/nginx/etc/nginx.conf.so-node
index 39688f3df..e5a68c09d 100644
--- a/salt/nginx/etc/nginx.conf.so-node
+++ b/salt/nginx/etc/nginx.conf.so-node
@@ -47,12 +47,12 @@ http {
         location / {
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }
 
diff --git a/salt/nginx/etc/nginx.conf.so-sensor b/salt/nginx/etc/nginx.conf.so-sensor
index 39688f3df..e5a68c09d 100644
--- a/salt/nginx/etc/nginx.conf.so-sensor
+++ b/salt/nginx/etc/nginx.conf.so-sensor
@@ -47,12 +47,12 @@ http {
         location / {
         }
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+        #error_page 404 /404.html;
+        #    location = /40x.html {
+        #}
 
         error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
+            location = /usr/share/nginx/html/50x.html {
         }
     }