diff --git a/nginx-core/etc/nginx/templates/location.d/00-root.conf.template b/nginx-core/etc/nginx/templates/location.d/60-root.conf.template
similarity index 100%
rename from nginx-core/etc/nginx/templates/location.d/00-root.conf.template
rename to nginx-core/etc/nginx/templates/location.d/60-root.conf.template
diff --git a/nginx-pwa/etc/nginx/templates/location.d/90-pwa.conf.template b/nginx-pwa/etc/nginx/templates/location.d/90-pwa-dynamic-files.conf.template
similarity index 63%
rename from nginx-pwa/etc/nginx/templates/location.d/90-pwa.conf.template
rename to nginx-pwa/etc/nginx/templates/location.d/90-pwa-dynamic-files.conf.template
index 8b027ec..278d861 100644
--- a/nginx-pwa/etc/nginx/templates/location.d/90-pwa.conf.template
+++ b/nginx-pwa/etc/nginx/templates/location.d/90-pwa-dynamic-files.conf.template
@@ -1,7 +1,3 @@
 location ~ /(config\.js|service-worker\.js|manifest\.webmanifest)$ {
   expires epoch;
 }
-
-location / {
-  try_files $uri /index.html =404;
-}
diff --git a/nginx-pwa/etc/nginx/templates/location.d/root.d/90-pwa.conf.template b/nginx-pwa/etc/nginx/templates/location.d/root.d/90-pwa.conf.template
new file mode 100644
index 0000000..666fe67
--- /dev/null
+++ b/nginx-pwa/etc/nginx/templates/location.d/root.d/90-pwa.conf.template
@@ -0,0 +1 @@
+  try_files $uri /index.html =404;