diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
index ea52172fc..ef7b01f0c 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
index e345e871a..89f4b3d2c 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl
index 2e5d9c8dd..ced7b44bc 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl
index 4b2ec7884..f850c4127 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl
index 2e5d9c8dd..ced7b44bc 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -1,7 +1,7 @@
 server {
     listen      %ip%:%web_ssl_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
@@ -12,7 +12,7 @@ server {
     ssl_certificate_key  %ssl_key%;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+            try_files $uri $uri/ /installer/index.php?$query_string;
         }
 
     location / {
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl
index 4b2ec7884..d7dd09ea8 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -1,14 +1,14 @@
 server {
     listen      %ip%:%web_port%;
     server_name %domain_idn% %alias_idn%;
-    root        %docroot%;
+    root        %docroot%/public;
     index       index.php index.html index.htm;
     access_log  /var/log/nginx/domains/%domain%.log combined;
     access_log  /var/log/nginx/domains/%domain%.bytes bytes;
     error_log   /var/log/nginx/domains/%domain%.error.log error;
 
     location /installer {
-            try_files $uri $uri/ /installer/index.php;
+        try_files $uri $uri/ /installer/index.php?$query_string;
     }
 
     location / {