diff --git a/.env.example b/.env.example
index e0f39c1c8d..9f0e95a022 100644
--- a/.env.example
+++ b/.env.example
@@ -67,7 +67,7 @@ SCRIPT_MICROSERVICE_PUSHER_PORT=
 
 # FrankenPHP workers ignore CLI php.ini. Use Caddyfile + --caddyfile=Caddyfile.
 # OCTANE_MEMORY_LIMIT=512M
-# OCTANE_MAX_EXECUTION_TIME=90
+# OCTANE_MAX_EXECUTION_TIME=120
 # OCTANE_POST_MAX_SIZE=200M
 # OCTANE_UPLOAD_MAX_FILESIZE=200M
 # OCTANE_MAX_INPUT_VARS=9000
diff --git a/Caddyfile b/Caddyfile
index 0a7307f085..783f19d7b5 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -3,8 +3,8 @@
 
 	frankenphp {
 			# FrankenPHP workers ignore CLI php.ini / PHPRC. Set PHP limits here.
-			php_ini memory_limit {$OCTANE_MEMORY_LIMIT:3072M}
-			php_ini max_execution_time {$OCTANE_MAX_EXECUTION_TIME:90}
+			php_ini memory_limit {$OCTANE_MEMORY_LIMIT:512M}
+			php_ini max_execution_time {$OCTANE_MAX_EXECUTION_TIME:120}
 			php_ini post_max_size {$OCTANE_POST_MAX_SIZE:200M}
 			php_ini upload_max_filesize {$OCTANE_UPLOAD_MAX_FILESIZE:200M}
 			php_ini max_input_vars {$OCTANE_MAX_INPUT_VARS:9000}
diff --git a/config/octane.php b/config/octane.php
index 9e221adfcd..610af79a57 100644
--- a/config/octane.php
+++ b/config/octane.php
@@ -155,6 +155,7 @@
         // Services with mutable state that must be recreated per request
         ProcessMaker\Managers\LoginManager::class,
         ProcessMaker\Managers\ModelerManager::class,
+        ProcessMaker\Managers\ScreenBuilderManager::class,
         Lavary\Menu\Menu::class,
     ],
 
@@ -254,7 +255,7 @@
 
     'caddy' => [
         'env' => [
-            'OCTANE_MEMORY_LIMIT' => env('OCTANE_MEMORY_LIMIT', '3072M'),
+            'OCTANE_MEMORY_LIMIT' => env('OCTANE_MEMORY_LIMIT', '512M'),
             'OCTANE_MAX_EXECUTION_TIME' => env('OCTANE_MAX_EXECUTION_TIME', 90),
             'OCTANE_POST_MAX_SIZE' => env('OCTANE_POST_MAX_SIZE', '200M'),
             'OCTANE_UPLOAD_MAX_FILESIZE' => env('OCTANE_UPLOAD_MAX_FILESIZE', '200M'),