diff --git a/webapps/etherpad/handlers/main.yml b/webapps/etherpad/handlers/main.yml
index ba8d85b1..bfc8c041 100644
--- a/webapps/etherpad/handlers/main.yml
+++ b/webapps/etherpad/handlers/main.yml
@@ -1,2 +1,11 @@
 ---
-# handlers file for mastodon
+# handlers file for etherpad
+- name: reload nginx
+  ansible.builtin.systemd:
+    name: nginx
+    state: reloaded
+
+- name: restart etherpad
+  ansible.builtin.systemd:
+    name: "{{ service }}.service"
+    state: restarted
diff --git a/webapps/etherpad/tasks/main.yml b/webapps/etherpad/tasks/main.yml
index 12398cd3..fc408c37 100644
--- a/webapps/etherpad/tasks/main.yml
+++ b/webapps/etherpad/tasks/main.yml
@@ -58,16 +58,13 @@
     src: "etherpad.service.j2"
     dest: "/etc/systemd/system/{{ service }}.service"
 
-- name: Enable systemd units
+- name: Enable systemd unit
   ansible.builtin.systemd:
     name: "{{ service }}.service"
     enabled: yes
     daemon_reload: yes
-
-- name: Start service
-  ansible.builtin.service:
-    name: "{{ service }}.service"
-    state: restarted
+  notify: 
+    - restart etherpad
 
 - name: Template nginx snippet for Let's Encrypt/Certbot
   ansible.builtin.template: 
@@ -90,17 +87,18 @@
       src: "/etc/nginx/sites-available/{{ service }}.conf"
       dest: "/etc/nginx/sites-enabled/{{ service }}.conf"
       state: link
-  - name: Reload nginx conf
-    ansible.builtin.service:
-      name: nginx
-      state: reloaded
+    notify: 
+      - reload nginx
+  - name: Flush handlers
+    ansible.builtin.meta: flush_handlers
   - name: Make sure /var/lib/letsencrypt exists and has correct permissions
     ansible.builtin.file: 
       path: /var/lib/letsencrypt
       state: directory
       mode: '0755'
   - name: Generate certificate with certbot
-    ansible.builtin.shell: certbot certonly --webroot --webroot-path /var/lib/letsencrypt --non-interactive --agree-tos --email {{ etherpad_certbot_admin_email }} -d {{ etherpad_domains |first }}
+    ansible.builtin.command:
+      cmd: certbot certonly --webroot --webroot-path /var/lib/letsencrypt --non-interactive --agree-tos --email {{ etherpad_certbot_admin_email }} -d {{ etherpad_domains |first }}
   - name: Create the ssl dir if needed
     ansible.builtin.file:
       path: /etc/nginx/ssl
@@ -121,14 +119,13 @@
   ansible.builtin.template:
     src: "vhost.conf.j2"
     dest: "/etc/nginx/sites-available/{{ service }}.conf"
+  notify: 
+    - reload nginx
 
 - name: Enable nginx vhost for etherpad
   ansible.builtin.file:
     src: "/etc/nginx/sites-available/{{ service }}.conf"
     dest: "/etc/nginx/sites-enabled/{{ service }}.conf"
     state: link
-
-- name: Reload nginx conf
-  ansible.builtin.service:
-    name: nginx
-    state: reloaded
+  notify: 
+    - reload nginx
diff --git a/webapps/etherpad/tasks/upgrade.yml b/webapps/etherpad/tasks/upgrade.yml
index 67e47f51..45d1fb45 100644
--- a/webapps/etherpad/tasks/upgrade.yml
+++ b/webapps/etherpad/tasks/upgrade.yml
@@ -8,7 +8,7 @@
     target: "~/{{ service }}.sql.gz"
 
 - name: Stop service
-  ansible.builtin.service:
+  ansible.builtin.systemd:
     name: "{{ service }}.service"
     state: stopped
 
@@ -35,7 +35,7 @@
   become_user: "{{ service }}"
 
 - name: Start service
-  ansible.builtin.service:
+  ansible.builtin.systemd:
     name: "{{ service }}.service"
     state: started
 
@@ -49,8 +49,4 @@
     state: absent
   when: keep_db_dump is undefined
   tags: clean
-
-- name: Reload nginx conf
-  ansible.builtin.service:
-    name: nginx
-    state: reloaded
+  notify: reload nginx