diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8934765..4d2a1b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.6.15 2023-09-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix PHP_TIMEOUT not affecting php-cli operations causing unnecessary Signal 15s in some cases
+
+
 ## 7.6.14 2023-09-05 <fermion2020@github>
 
    ### Changed
diff --git a/install/assets/defaults/20-php-fpm b/install/assets/defaults/20-php-fpm
index 77625d0..5fa265a 100755
--- a/install/assets/defaults/20-php-fpm
+++ b/install/assets/defaults/20-php-fpm
@@ -37,6 +37,7 @@ PHP_OPCACHE_REVALIDATE_FREQ=${PHP_OPCACHE_REVALIDATE_FREQ:-"2"}
 PHP_OPCACHE_SAVE_COMMENTS=${PHP_OPCACHE_SAVE_COMMENTS:-"1"}
 PHP_OPCACHE_VALIDATE_TIMESTAMPS=${PHP_OPCACHE_VALIDATE_TIMESTAMPS:-"1"}
 PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-"2G"}
+
 PHP_TIMEOUT=${PHP_TIMEOUT:-"180"}
 PHP_UPLOAD_MAX_SIZE=${PHP_UPLOAD_MAX_SIZE:-"2G"}
 PHP_VERSION=${PHP_VERSION:-$(php -v 2>/dev/null | grep "^PHP " | head -n 1 | awk '{print $2}')}
diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
index e24d677..ac99c0d 100755
--- a/install/assets/functions/20-php-fpm
+++ b/install/assets/functions/20-php-fpm
@@ -251,6 +251,7 @@ phpfpm_configure_server() {
 
     sed -i \
                 -e "s#memory_limit = .*#memory_limit = ${PHP_MEMORY_LIMIT}#g" \
+                -e "s#max_execution_time = .*#max_execution_time = ${PHP_TIMEOUT}#g" \
                 -e "s#max_input_time = .*#max_input_time = ${PHP_TIMEOUT}#g" \
                 -e "s#default_socket_timeout = .*#default_socket_timeout = ${PHP_TIMEOUT}#g" \
                 -e "s#post_max_size = .*#post_max_size = ${PHP_UPLOAD_MAX_SIZE}#g" \