diff --git a/roles/matomo/tasks/install.yml b/roles/matomo/tasks/install.yml
index 694d34c7f..4280de403 100644
--- a/roles/matomo/tasks/install.yml
+++ b/roles/matomo/tasks/install.yml
@@ -14,7 +14,7 @@
 
 - name: "Run roles/www_options/tasks/set-php-limits.yml with 'nginx_high_php_limits: False' by default"
   include_tasks: roles/www_options/tasks/set-php-limits.yml
-  when: set_php_limits is undefined
+  when: set_php_limits_done is undefined
 
 
 - name: Start MariaDB
diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml
index 0ab9c921e..4e39ddebe 100644
--- a/roles/moodle/tasks/install.yml
+++ b/roles/moodle/tasks/install.yml
@@ -19,7 +19,7 @@
 
 - name: "Run roles/www_options/tasks/set-php-limits.yml with 'nginx_high_php_limits: True' by default"
   include_tasks: roles/www_options/tasks/set-php-limits.yml
-  when: set_php_limits is undefined
+  when: set_php_limits_done is undefined
 
 
 # 2021-07-02: Let's monitor & learn from these 2 pages year-by-year:
diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml
index eb6f350bb..35e80a825 100644
--- a/roles/nextcloud/tasks/install.yml
+++ b/roles/nextcloud/tasks/install.yml
@@ -42,7 +42,7 @@
 
 - name: "Run roles/www_options/tasks/set-php-limits.yml with 'nginx_high_php_limits: False' by default"
   include_tasks: roles/www_options/tasks/set-php-limits.yml
-  when: set_php_limits is undefined
+  when: set_php_limits_done is undefined
 
 
 # February 2020: See @m-anish's PR #2119 and follow-up PR #2258.
diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml
index 471bb4b82..cc976e97f 100644
--- a/roles/pbx/tasks/freepbx.yml
+++ b/roles/pbx/tasks/freepbx.yml
@@ -4,7 +4,7 @@
 
 - name: "Run roles/www_options/tasks/set-php-limits.yml with 'nginx_high_php_limits: False' by default"
   include_tasks: roles/www_options/tasks/set-php-limits.yml
-  when: set_php_limits is undefined
+  when: set_php_limits_done is undefined
 
 
 # 2021-08-04: Non-native systemd service 'asterisk.service' (redirects via
diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml
index 3dfd96cbf..b2bcd27b9 100644
--- a/roles/wordpress/tasks/install.yml
+++ b/roles/wordpress/tasks/install.yml
@@ -14,7 +14,7 @@
 
 - name: "Run roles/www_options/tasks/set-php-limits.yml with 'nginx_high_php_limits: False' by default"
   include_tasks: roles/www_options/tasks/set-php-limits.yml
-  when: set_php_limits is undefined
+  when: set_php_limits_done is undefined
 
 
 # 2021-06-29: PHP modules, covering "RECOMMENDED" and "OPTIONAL" sections here:
diff --git a/roles/www_options/tasks/set-php-limits.yml b/roles/www_options/tasks/set-php-limits.yml
index e71c22c99..b9ee0b0a5 100644
--- a/roles/www_options/tasks/set-php-limits.yml
+++ b/roles/www_options/tasks/set-php-limits.yml
@@ -89,9 +89,9 @@
     name: php{{ php_version }}-fpm
     state: restarted
 
-- name: "Set 'set_php_limits: True' so set-php-limits.yml runs just once (per Ansible run)"
+- name: "Set 'set_php_limits_done: True' so set-php-limits.yml runs just once (per Ansible run)"
   set_fact:
-    set_php_limits: True
+    set_php_limits_done: True
 
 
 # - debug: