diff --git a/etherpad/defaults/main.yml b/etherpad/defaults/main.yml
index bc8f5b041605529c98c7cd941493ee86dcf59359..010877c05306df4013d21039644e51efb72cfd0f 100644
--- a/etherpad/defaults/main.yml
+++ b/etherpad/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 etherpad_web_root: "/opt/etherpad"
-etherpad_version: "HEAD"
+etherpad_version: "1.8.11"
 
 etherpads: []
 
diff --git a/etherpad/handlers/main.yml b/etherpad/handlers/main.yml
index 968e986a3b040a1fabbf0feb98be378ffe3d718a..6d44659b3b8fea684154132a687308dc46e319ab 100644
--- a/etherpad/handlers/main.yml
+++ b/etherpad/handlers/main.yml
@@ -8,7 +8,7 @@
     daemon_reload: true
 
 - name: restart etherpad
-  debug:
-    var: item
-  when: item.value.changed
+  systemd:
+    name: "etherpad@{{ item.item.name }}.service"
+    state: restarted
   with_items: "{{ etherpad_config.results }}"