diff --git a/README.md b/README.md
index 865fc0c..728a8a9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Nextcloud for YunoHost
 own data. A personal cloud which run on your own server. With Nextcloud
 you can synchronize your files over your devices.
 
-**Shipped version:** 15.0.4
+**Shipped version:** 15.0.5
 
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 ![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Overview.png)
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2e085c9..7cdfd8f 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,7 +13,7 @@ location ^~ __PATH__ {
   }
 
   # Add headers to serve security related headers
-  more_set_headers "Strict-Transport-Security: max-age=15768000";
+  more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;";
   more_set_headers "X-Content-Type-Options: nosniff";
   more_set_headers "X-XSS-Protection: 1; mode=block";
   more_set_headers "X-Robots-Tag: none";
@@ -59,9 +59,9 @@ location ^~ __PATH__ {
     deny all;
   }
 
-  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+  location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|ocm-provider/.+)\.php(/.*|)$ {
     include fastcgi_params;
-    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+    fastcgi_split_path_info ^(.+\.php)(/.*|)$;
     fastcgi_param SCRIPT_FILENAME $request_filename;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param HTTPS on;
@@ -71,14 +71,15 @@ location ^~ __PATH__ {
     fastcgi_intercept_errors on;
   }
 
-  location ~ ^__PATH__/(?:updater|ocs-provider)(?:$|/) {
+  location ~ ^__PATH__/(?:updater|ocs-provider|ocm-provider)(?:$|/) {
     try_files $uri/ =404;
     index index.php;
   }
 
   # Adding the cache control header for js and css files
-  location ~* \.(?:css|js)$ {
-    more_set_headers "Cache-Control: public, max-age=7200";
+  location ~ ^__PATH__/.+[^/]\.(?:css|js|woff2?|svg|gif)$ {
+    try_files $uri __PATH__/index.php$request_uri;
+    more_set_headers "Cache-Control: public, max-age=15778463";
     # Add headers to serve security related headers
     more_set_headers "Strict-Transport-Security: max-age=15768000";
     more_set_headers "X-Content-Type-Options: nosniff";
@@ -92,7 +93,7 @@ location ^~ __PATH__ {
     access_log off;
   }
 
-  location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+  location ~* \.(?:png|html|ttf|ico|jpg|jpeg)$ {
     # Optional: Don't log access to other assets
     access_log off;
   }
diff --git a/manifest.json b/manifest.json
index 43bf976..77642da 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Access & share your files, calendars, contacts, mail & more from any device, on your terms",
         "fr": "Consultez et partagez vos fichiers, agendas, carnets d'adresses, emails et bien plus depuis les appareils de votre choix, sous vos conditions"
     },
-    "version": "15.0.4~ynh1",
+    "version": "15.0.5~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index 80d65dd..e66bb23 100755
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="15.0.4"
+next_version="15.0.5"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="f87db047c174f563e391a22c959d9ace767ca14ef0f97fc394f3061fc63d8f77"
+nextcloud_source_sha256="4661869b797a340cd967abb3dbe6931b375434e0a44480346a27ccd73250b988"
 
 # This function will only be executed upon applying the last upgrade referenced above
 last_upgrade_operations () {