diff --git a/conf/php-fpm.conf b/conf/extra_php-fpm.conf
similarity index 100%
rename from conf/php-fpm.conf
rename to conf/extra_php-fpm.conf
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7282e13..19726a3 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,8 +6,10 @@ location __PATH__/ {
 
   index index.php;
 
-  try_files $uri @rewriteapp;
+  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
+  client_max_body_size 50M;
 
+  try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
@@ -19,7 +21,3 @@ location __PATH__/ {
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
 }
-
-location @rewriteapp {
-    rewrite ^(.*)$ /index.php/$1 last;
-}