diff --git a/tasks/main.yml b/tasks/main.yml
index 957dad66a72b0c0c9ddc3f6ee40a6ed89127a7d1..46c11065c87aa52ef5f824866596f098fd536d61 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,7 +12,6 @@
 - block:
 
   - include: php.yml
-    when: role_php_completed is not defined
 
   - name: "Disable OpCache for CLI and FPM, they are there twice"
     command: 'phpdismod -s {{ item }} opcache'
@@ -25,4 +24,4 @@
     set_fact: role_php_completed=true
     tags: always
 
-  when: '"php" not in excluded_roles'
+  when: '"php" not in excluded_roles and role_php_completed is not defined'