diff --git a/.gitmodules b/.gitmodules
index 2007f00..cd6f147 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "roles/dokuwiki"]
 	path = roles/dokuwiki
 	url = git@gitlab.federez.net:erdnaxe/ansible-role-dokuwiki.git
+[submodule "roles/etherpad"]
+	path = roles/etherpad
+	url = git@gitlab.federez.net:erdnaxe/ansible-role-etherpad.git
diff --git a/etherpad.yml b/etherpad.yml
new file mode 100644
index 0000000..3512b46
--- /dev/null
+++ b/etherpad.yml
@@ -0,0 +1,6 @@
+---
+# Install EtherPad on EtherPad containers
+- hosts: pad-ovh
+  roles:
+   - etherpad
+
diff --git a/hosts b/hosts
index 5bdf6b3..b287863 100644
--- a/hosts
+++ b/hosts
@@ -9,6 +9,7 @@ horus-phabricator   ansible_host=10.128.0.50
 horus-wiki          ansible_host=10.128.0.51
 horus-www           ansible_host=10.128.0.52
 horus-wikitest      ansible_host=10.128.0.53
+pad-ovh             ansible_host=10.128.0.54
 horus-proxy-web     ansible_host=10.128.0.254
 
 [ovh-vm]
diff --git a/roles/baseconfig b/roles/baseconfig
index 131bb1b..20457b7 160000
--- a/roles/baseconfig
+++ b/roles/baseconfig
@@ -1 +1 @@
-Subproject commit 131bb1b6f9997a52c72e089e92161e5016474e6f
+Subproject commit 20457b74f8501c334c57c2b49b02b8a242f18bd9
diff --git a/roles/etherpad b/roles/etherpad
new file mode 160000
index 0000000..80a2b0d
--- /dev/null
+++ b/roles/etherpad
@@ -0,0 +1 @@
+Subproject commit 80a2b0df2ba82bd107bdda4bfa48ad55fa8e64bb