diff --git a/14.0/unit/Dockerfile b/14.0/unit/Dockerfile
index f130e00..83e7232 100644
--- a/14.0/unit/Dockerfile
+++ b/14.0/unit/Dockerfile
@@ -118,18 +118,45 @@ RUN \
 	  }, \
 	  "routes": { \
 	    "main": [ \
-	      { "match": { "uri": "/console.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/cron.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/index.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/public.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/remote.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/status.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/version.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/core/img/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/css/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/fonts/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/js/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/themes/*" }, "action": { "share": "/var/www/html" } }, \
+	      { \
+                "match": { \
+	          "uri": [ \
+	            "/index.php*", \
+	            "/remote.php*", \
+	            "/public.php*", \
+	            "/cron.php*", \
+	            "/core/ajax/update.php*", \
+	            "/status.php*", \
+	            "/ocs/v1.php*", \
+	            "/ocs/v2.php*", \
+	            "/updater/*.php", \
+	            "/ocs-provider/*.php", \
+	            "/ocm-provider/*.php" \
+	          ] \
+                }, \
+                "action": { "pass": "applications/direct_php" } \
+              }, \
+	      { \
+                "match": { \
+                  "uri": [ \
+                    "*.css", \
+                    "*.js", \
+                    "*.woff", \
+                    "*.woff2", \
+                    "*.svg", \
+                    "*.gif", \
+                    "*.map", \
+                    "*.png", \
+                    "*.html", \
+                    "*.ttf", \
+                    "*.ico", \
+                    "*.jpg", \
+                    "*.jpeg", \
+                    "*.bcmap" \
+                  ] \
+                }, \
+                "action": { "share": "/var/www/html" } \
+              }, \
 	      { "action": { "pass": "applications/index_php" } } \
 	    ], \
 	    "static": [ \
diff --git a/15.0/unit/Dockerfile b/15.0/unit/Dockerfile
index fef836a..28c4629 100644
--- a/15.0/unit/Dockerfile
+++ b/15.0/unit/Dockerfile
@@ -118,18 +118,45 @@ RUN \
 	  }, \
 	  "routes": { \
 	    "main": [ \
-	      { "match": { "uri": "/console.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/cron.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/index.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/public.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/remote.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/status.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/version.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/core/img/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/css/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/fonts/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/js/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/themes/*" }, "action": { "share": "/var/www/html" } }, \
+	      { \
+                "match": { \
+	          "uri": [ \
+	            "/index.php*", \
+	            "/remote.php*", \
+	            "/public.php*", \
+	            "/cron.php*", \
+	            "/core/ajax/update.php*", \
+	            "/status.php*", \
+	            "/ocs/v1.php*", \
+	            "/ocs/v2.php*", \
+	            "/updater/*.php", \
+	            "/ocs-provider/*.php", \
+	            "/ocm-provider/*.php" \
+	          ] \
+                }, \
+                "action": { "pass": "applications/direct_php" } \
+              }, \
+	      { \
+                "match": { \
+                  "uri": [ \
+                    "*.css", \
+                    "*.js", \
+                    "*.woff", \
+                    "*.woff2", \
+                    "*.svg", \
+                    "*.gif", \
+                    "*.map", \
+                    "*.png", \
+                    "*.html", \
+                    "*.ttf", \
+                    "*.ico", \
+                    "*.jpg", \
+                    "*.jpeg", \
+                    "*.bcmap" \
+                  ] \
+                }, \
+                "action": { "share": "/var/www/html" } \
+              }, \
 	      { "action": { "pass": "applications/index_php" } } \
 	    ], \
 	    "static": [ \
diff --git a/16.0/unit/Dockerfile b/16.0/unit/Dockerfile
index f83fa70..1e80b40 100644
--- a/16.0/unit/Dockerfile
+++ b/16.0/unit/Dockerfile
@@ -118,18 +118,45 @@ RUN \
 	  }, \
 	  "routes": { \
 	    "main": [ \
-	      { "match": { "uri": "/console.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/cron.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/index.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/public.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/remote.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/status.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/version.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/core/img/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/css/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/fonts/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/js/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/themes/*" }, "action": { "share": "/var/www/html" } }, \
+	      { \
+                "match": { \
+	          "uri": [ \
+	            "/index.php*", \
+	            "/remote.php*", \
+	            "/public.php*", \
+	            "/cron.php*", \
+	            "/core/ajax/update.php*", \
+	            "/status.php*", \
+	            "/ocs/v1.php*", \
+	            "/ocs/v2.php*", \
+	            "/updater/*.php", \
+	            "/ocs-provider/*.php", \
+	            "/ocm-provider/*.php" \
+	          ] \
+                }, \
+                "action": { "pass": "applications/direct_php" } \
+              }, \
+	      { \
+                "match": { \
+                  "uri": [ \
+                    "*.css", \
+                    "*.js", \
+                    "*.woff", \
+                    "*.woff2", \
+                    "*.svg", \
+                    "*.gif", \
+                    "*.map", \
+                    "*.png", \
+                    "*.html", \
+                    "*.ttf", \
+                    "*.ico", \
+                    "*.jpg", \
+                    "*.jpeg", \
+                    "*.bcmap" \
+                  ] \
+                }, \
+                "action": { "share": "/var/www/html" } \
+              }, \
 	      { "action": { "pass": "applications/index_php" } } \
 	    ], \
 	    "static": [ \
diff --git a/17.0/unit/Dockerfile b/17.0/unit/Dockerfile
index 76a7e3d..1f224ed 100644
--- a/17.0/unit/Dockerfile
+++ b/17.0/unit/Dockerfile
@@ -118,18 +118,45 @@ RUN \
 	  }, \
 	  "routes": { \
 	    "main": [ \
-	      { "match": { "uri": "/console.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/cron.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/index.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/public.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/remote.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/status.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/version.php" }, "action": { "pass": "applications/direct_php" } }, \
-	      { "match": { "uri": "/core/img/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/css/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/fonts/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/core/js/*" }, "action": { "share": "/var/www/html" } }, \
-	      { "match": { "uri": "/themes/*" }, "action": { "share": "/var/www/html" } }, \
+	      { \
+                "match": { \
+	          "uri": [ \
+	            "/index.php*", \
+	            "/remote.php*", \
+	            "/public.php*", \
+	            "/cron.php*", \
+	            "/core/ajax/update.php*", \
+	            "/status.php*", \
+	            "/ocs/v1.php*", \
+	            "/ocs/v2.php*", \
+	            "/updater/*.php", \
+	            "/ocs-provider/*.php", \
+	            "/ocm-provider/*.php" \
+	          ] \
+                }, \
+                "action": { "pass": "applications/direct_php" } \
+              }, \
+	      { \
+                "match": { \
+                  "uri": [ \
+                    "*.css", \
+                    "*.js", \
+                    "*.woff", \
+                    "*.woff2", \
+                    "*.svg", \
+                    "*.gif", \
+                    "*.map", \
+                    "*.png", \
+                    "*.html", \
+                    "*.ttf", \
+                    "*.ico", \
+                    "*.jpg", \
+                    "*.jpeg", \
+                    "*.bcmap" \
+                  ] \
+                }, \
+                "action": { "share": "/var/www/html" } \
+              }, \
 	      { "action": { "pass": "applications/index_php" } } \
 	    ], \
 	    "static": [ \