diff --git a/group_vars/etherpad.yml b/group_vars/etherpad.yml
index 2415094c..ca0deceb 100644
--- a/group_vars/etherpad.yml
+++ b/group_vars/etherpad.yml
@@ -7,6 +7,7 @@ glob_etherpad:
       skin: crans
       ip: 0.0.0.0
       port: 9001
+      version: 1.8.18
       database:
         user: crans
         host: pgsql.adm.crans.org
@@ -24,6 +25,7 @@ glob_etherpad:
       skin: crans
       ip: 0.0.0.0
       port: 9002
+      version: 1.8.18
       database:
         user: crans
         host: pgsql.adm.crans.org
diff --git a/roles/etherpad/tasks/main.yml b/roles/etherpad/tasks/main.yml
index 28497312..9667b965 100644
--- a/roles/etherpad/tasks/main.yml
+++ b/roles/etherpad/tasks/main.yml
@@ -11,11 +11,20 @@
   retries: 3
   until: apt_result is succeeded
 
+- name: Create etherpad directory
+  file:
+    path: /var/www/{{ item.name }}
+    state: directory
+    owner: etherpad
+    group: etherpad
+  loop: "{{ etherpad.instances }}"
+
 - name: Clone EtherPad
   git:
     repo: https://github.com/ether/etherpad-lite.git
     dest: /var/www/{{ item.name }}
-    version: 1.8.4
+    version: "{{ item.version }}"
+    force: true
   loop: "{{ etherpad.instances }}"
   become: true
   become_user: etherpad