diff --git a/conf/nginx.conf b/conf/nginx.conf
index 3a93921..29739e9 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -10,23 +10,23 @@ location __PATH__/ {
   }
 
   index index.php;
-  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
-  #client_max_body_size 50M;
-
-  try_files "" @libreto;
 
   location __PATH__/libreto/assets/ {
      alias __FINALPATH__/libreto/assets/;
   }
-  # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
-}
 
-location @libreto {
-    fastcgi_pass unix:/var/run/php__PHPVERSION__-fpm-__NAME__.sock;
+  try_files $uri $uri/ index.php;
+  location ~ [^/]\.php(/|$) {
+    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
-    fastcgi_param REMOTE_USER $remote_user;
-    fastcgi_param SCRIPT_FILENAME __FINALPATH__/index.php;
+    fastcgi_param REMOTE_USER     $remote_user;
+    fastcgi_param PATH_INFO       $fastcgi_path_info;
+    fastcgi_param SCRIPT_FILENAME $request_filename;
+  }
+
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }