diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php
index ff33af3ad..09d6fbdf8 100644
--- a/src/SPC/builder/linux/LinuxBuilder.php
+++ b/src/SPC/builder/linux/LinuxBuilder.php
@@ -168,8 +168,16 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
 
         SourcePatcher::patchBeforeConfigure($this);
 
-        $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
-        $zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
+        $phpVersionID = $this->getPHPVersionID();
+        $json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
+
+        if ($this->getOption('enable-zts', false)) {
+            $maxExecutionTimers = $phpVersionID >= 80100 ? '--enable-zend-max-execution-timers ' : '';
+            $zts = '--enable-zts --disable-zend-signals ';
+        } else {
+            $maxExecutionTimers = '';
+            $zts = '';
+        }
 
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
@@ -185,6 +193,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
                 '--enable-fpm ' .
                 $json_74 .
                 $zts .
+                $maxExecutionTimers .
                 '--enable-micro=all-static ' .
                 $this->makeExtensionArgs() . ' ' .
                 $envs
diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php
index 8378f080b..0e8c98f00 100644
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -149,7 +149,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
         SourcePatcher::patchBeforeConfigure($this);
 
         $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
-        $zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
+        $zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
 
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(