diff --git a/bundles/nginx/files/fastcgi.conf b/bundles/nginx/files/fastcgi.conf
index 53c0edd..be944f2 100644
--- a/bundles/nginx/files/fastcgi.conf
+++ b/bundles/nginx/files/fastcgi.conf
@@ -1,26 +1,36 @@
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_split_path_info ^(.+\.php)(/.+)$;
+if (!-f $document_root$fastcgi_script_name) {
+    return 404;
+}
+
+fastcgi_index index.php;
+
 fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  CONTENT_TYPE       $content_type;
 fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  REQUEST_SCHEME     $scheme;
-fastcgi_param  HTTPS              $https if_not_empty;
-
+fastcgi_param  DOCUMENT_URI       $document_uri;
 fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
+fastcgi_param  HTTPS              $https if_not_empty;
+fastcgi_param  HTTP_AUTHORIZATION $http_authorization;
+fastcgi_param  PATH_INFO          $fastcgi_path_info;
+fastcgi_param  PATH_TRANSLATED    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REDIRECT_STATUS    200;
 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-fastcgi_param  REDIRECT_STATUS    200;
-
-# This is the only thing that's different to the debian default.
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  REQUEST_URI        $request_uri;
 fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_NAME        $server_name;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_buffers 8 16k;
+fastcgi_buffer_size 32k;
+
+client_body_buffer_size 128k;
diff --git a/bundles/nginx/files/site_template b/bundles/nginx/files/site_template
index 9d55282..0c0d7f6 100644
--- a/bundles/nginx/files/site_template
+++ b/bundles/nginx/files/site_template
@@ -142,7 +142,6 @@ server {
 % if php:
     location ~ \.php$ {
         include fastcgi.conf;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass unix:/run/php/php${php_version}-fpm.sock;
     }
 %  if not max_body_size: