diff --git a/conf/nginx.conf b/conf/nginx.conf
index 525b40a..f279cf3 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -12,10 +12,7 @@ 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 $uri $uri/ __PATH__/index.php;
+  try_files $uri $uri/ @bicbucstriim;
 
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
@@ -31,3 +28,7 @@ location __PATH__/ {
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
+
+location @bicbucstriim {
+    rewrite /(.*)$ /index.php?/$1 last;
+}