diff --git a/handlers/main.yml b/handlers/main.yml
index 49a1827..e6bd939 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -17,12 +17,12 @@
   ansible.builtin.service:
     name: apache2
     state: restarted
+  listen: Restart webserver
   when: ansible_facts.services is search("apache2.service")
-  notify:
-    - Restart php-fpm
 
 - name: Restart php-fpm
   ansible.builtin.service:
     name: "{{ ansible_facts.services | select('search', '-fpm.service') | first }}"
     state: restarted
+  listen: Restart webserver
   when: ansible_facts.services is search("-fpm.service")
diff --git a/tasks/main.yml b/tasks/main.yml
index 219a21f..81c6b0b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -88,7 +88,7 @@
     follow: False
     mode: 0777
   register: link
-  notify: Restart apache
+  notify: Restart webserver
 
 - name: Link www to current roundcube release public_html directory
   ansible.builtin.file:
@@ -100,7 +100,7 @@
     follow: False
     mode: 0777
   register: link
-  notify: Restart apache
+  notify: Restart webserver
 
 - name: Ensure roundcube and plugin configs are latest
   ansible.builtin.template: