diff --git a/.gitmodules b/.gitmodules
index 1f42f9b..2d72973 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "roles/do1jlr.ntp"]
 	path = roles/do1jlr.ntp
 	url = https://github.com/roles-ansible/ansible_role_ntp.git
+[submodule "roles/do1jlr.etebase"]
+	path = roles/do1jlr.etebase
+	url = https://github.com/roles-ansible/ansible_role_etebase.git
diff --git a/hosts.ini b/hosts.ini
index 160d378..cf82d6e 100644
--- a/hosts.ini
+++ b/hosts.ini
@@ -4,6 +4,9 @@ web01.l3d.space
 [mail]
 mail01.l3d.space
 
+[services]
+services.l3d.space
+
 # [home]
 # luna.l3d.ch ansible_host=luna.local
 
diff --git a/roles/do1jlr.etebase b/roles/do1jlr.etebase
new file mode 160000
index 0000000..51b7b3a
--- /dev/null
+++ b/roles/do1jlr.etebase
@@ -0,0 +1 @@
+Subproject commit 51b7b3aa6882d855481ed4128d11a21070432c1e
diff --git a/roles/do1jlr.ranger b/roles/do1jlr.ranger
index 46cfecf..ad75843 160000
--- a/roles/do1jlr.ranger
+++ b/roles/do1jlr.ranger
@@ -1 +1 @@
-Subproject commit 46cfecf077bc03362362b7d365c30f4ec626c988
+Subproject commit ad758436369d3de02a5214e29464bfbaa233521e
diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban
index b1efd0b..1cc6aca 160000
--- a/roles/robertdebock.fail2ban
+++ b/roles/robertdebock.fail2ban
@@ -1 +1 @@
-Subproject commit b1efd0b0a2d2bd6c295786d5f8a8b8cf1303c9d3
+Subproject commit 1cc6aca2275e1abdd25d51a3db2d8ca705d0640b
diff --git a/site.yml b/site.yml
index 5e14ec4..84c2043 100644
--- a/site.yml
+++ b/site.yml
@@ -37,6 +37,11 @@
   roles:
     - {role: do1jlr.unbound, tags: [mail, unbound]}
 
+- name: Deploy services
+  hosts: services
+  roles:
+    - {role: do1jlr.etebase, tags: [etebase, etesync, calendar, kalender, contacts, kontakte]}
+
 - name: Deploy mail config
   hosts: mail
   roles: