diff --git a/tasks/apache2_modules.yaml b/tasks/apache2_modules.yaml
index 976c0b2..2ebce49 100644
--- a/tasks/apache2_modules.yaml
+++ b/tasks/apache2_modules.yaml
@@ -3,23 +3,33 @@
   community.general.apache2_module:
     name: rewrite
     state: present
+  notify:
+    - Restart Apache
 
 - name: Enable mod_headers
   community.general.apache2_module:
     name: headers
     state: present
+  notify:
+    - Restart Apache
 
 - name: Enable mod_env
   community.general.apache2_module:
     name: env
     state: present
+  notify:
+    - Restart Apache
 
 - name: Enable mod_dir
   community.general.apache2_module:
     name: dir
     state: present
+  notify:
+    - Restart Apache
 
 - name: Enable mod_mime
   community.general.apache2_module:
     name: mime
     state: present
+  notify:
+    - Restart Apache
diff --git a/tasks/apache2_template.yaml b/tasks/apache2_template.yaml
index fced412..1bb1b6a 100644
--- a/tasks/apache2_template.yaml
+++ b/tasks/apache2_template.yaml
@@ -6,6 +6,8 @@
     mode: '0644'
   become: true
   when: not nextcloud_apache2_virtualhost
+  notify:
+    - Enable Nextcloud site
 
 - name: Write virtualhost nextcloud.conf file
   ansible.builtin.template:
@@ -14,3 +16,5 @@
     mode: '0644'
   become: true
   when: nextcloud_apache2_virtualhost
+  notify:
+    - Enable Nextcloud site
diff --git a/tasks/main.yaml b/tasks/main.yaml
index d1e6dd7..7b04bda 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -2,20 +2,14 @@
 - name: Create Apache2 config
   include_tasks: apache2_template.yaml
   when: not nextcloud_nginx
-  notify:
-    - Enable Nextcloud site
 
 - name: Enable Apache2 modules
   include_tasks: apache2_modules.yaml
   when: not nextcloud_nginx
-  notify:
-    - Restart Apache
 
 - name: Create nginx config
   include_tasks: nginx_template.yaml
   when: nextcloud_nginx
-  notify:
-    - Restart nginx
 
 - name: Change ownership of Nextcloud directories
   ansible.builtin.file:
diff --git a/tasks/nginx_template.yaml b/tasks/nginx_template.yaml
index 0e4987f..827cf3f 100644
--- a/tasks/nginx_template.yaml
+++ b/tasks/nginx_template.yaml
@@ -5,3 +5,5 @@
     dest: "{{ nextcloud_nginx_config_path }}"
     mode: '0644'
   become: true
+  notify:
+    - Restart nginx