diff --git a/frameworks/PHP/mako/app/controllers/Index.php b/frameworks/PHP/mako/app/http/controllers/Index.php
similarity index 98%
rename from frameworks/PHP/mako/app/controllers/Index.php
rename to frameworks/PHP/mako/app/http/controllers/Index.php
index 701da352c36..d5ec3eecebc 100644
--- a/frameworks/PHP/mako/app/controllers/Index.php
+++ b/frameworks/PHP/mako/app/http/controllers/Index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\http\controllers;
 
 use mako\http\routing\Controller;
 use mako\view\ViewFactory;
diff --git a/frameworks/PHP/mako/app/routing/constraints.php b/frameworks/PHP/mako/app/http/routing/constraints.php
similarity index 100%
rename from frameworks/PHP/mako/app/routing/constraints.php
rename to frameworks/PHP/mako/app/http/routing/constraints.php
diff --git a/frameworks/PHP/mako/app/routing/middleware.php b/frameworks/PHP/mako/app/http/routing/middleware.php
similarity index 100%
rename from frameworks/PHP/mako/app/routing/middleware.php
rename to frameworks/PHP/mako/app/http/routing/middleware.php
diff --git a/frameworks/PHP/mako/app/routing/routes.php b/frameworks/PHP/mako/app/http/routing/routes.php
similarity index 91%
rename from frameworks/PHP/mako/app/routing/routes.php
rename to frameworks/PHP/mako/app/http/routing/routes.php
index 279edaba664..3a085831767 100644
--- a/frameworks/PHP/mako/app/routing/routes.php
+++ b/frameworks/PHP/mako/app/http/routing/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-use app\controllers\Index;
+use app\http\controllers\Index;
 
 /** @var \mako\http\routing\Routes $routes */
 
diff --git a/frameworks/PHP/mako/app/init.php b/frameworks/PHP/mako/app/init.php
index 226f98f30c9..22f829d5dbf 100644
--- a/frameworks/PHP/mako/app/init.php
+++ b/frameworks/PHP/mako/app/init.php
@@ -4,7 +4,7 @@
  * Configure PHP error reporting.
  * @see http://php.net/manual/en/function.error-reporting.php
  */
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL);
 
 /*
  * Choose if errors that are NOT caught by the Mako error and exception handlers should be
diff --git a/frameworks/PHP/mako/app/models/Fortune.php b/frameworks/PHP/mako/app/models/Fortune.php
index 1e1a5502121..daa02f77206 100644
--- a/frameworks/PHP/mako/app/models/Fortune.php
+++ b/frameworks/PHP/mako/app/models/Fortune.php
@@ -5,5 +5,5 @@
 use mako\database\midgard\ORM;
 
 class Fortune extends ORM {
-	protected $tableName = 'Fortune';
+	protected string $tableName = 'Fortune';
 }
\ No newline at end of file
diff --git a/frameworks/PHP/mako/app/models/World.php b/frameworks/PHP/mako/app/models/World.php
index 8a813ea96dd..6be689c9465 100644
--- a/frameworks/PHP/mako/app/models/World.php
+++ b/frameworks/PHP/mako/app/models/World.php
@@ -5,5 +5,5 @@
 use mako\database\midgard\ORM;
 
 class World extends ORM {
-	protected $tableName = 'World';
+	protected string $tableName = 'World';
 }
\ No newline at end of file
diff --git a/frameworks/PHP/mako/composer.json b/frameworks/PHP/mako/composer.json
index 5ddc83ec4a3..ec58301deff 100644
--- a/frameworks/PHP/mako/composer.json
+++ b/frameworks/PHP/mako/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": ">=7.4.0",
-        "mako/framework": "^9.0"
+        "mako/framework": "^11.0"
     },
 	"autoload": {
         "psr-4": {
diff --git a/frameworks/PHP/mako/mako.dockerfile b/frameworks/PHP/mako/mako.dockerfile
index 07010604204..837761967b1 100644
--- a/frameworks/PHP/mako/mako.dockerfile
+++ b/frameworks/PHP/mako/mako.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,16 +7,16 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get install -yqq nginx git unzip \
-    php8.3-cli php8.3-fpm php8.3-mysql php8.3-mbstring php8.3-xml php8.3-curl > /dev/null
+    php8.5-cli php8.5-fpm php8.5-mysql php8.5-mbstring php8.5-xml php8.5-curl > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-COPY deploy/conf/* /etc/php/8.3/fpm/
+COPY deploy/conf/* /etc/php/8.5/fpm/
 
 ADD ./ /mako
 WORKDIR /mako
 
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.5/fpm/php-fpm.conf ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --ignore-platform-reqs --quiet
 
@@ -24,5 +24,5 @@ RUN chmod -R 777 app
 
 EXPOSE 8080
 
-CMD service php8.3-fpm start && \
+CMD service php8.5-fpm start && \
     nginx -c /mako/deploy/nginx.conf
diff --git a/frameworks/PHP/mako/public/index.php b/frameworks/PHP/mako/public/index.php
index 8f0116fb5dc..b7e7748bb18 100644
--- a/frameworks/PHP/mako/public/index.php
+++ b/frameworks/PHP/mako/public/index.php
@@ -1,5 +1,6 @@
 <?php
 
+use mako\application\CurrentApplication;
 use mako\application\web\Application;
 
 /**
@@ -10,4 +11,4 @@
 /*
  * Start and run the application.
  */
-Application::start(MAKO_APPLICATION_PATH)->run();
+CurrentApplication::set(new Application(MAKO_APPLICATION_PATH))->run();