diff --git a/production.yml b/production.yml
index 102be28..acc2b78 100644
--- a/production.yml
+++ b/production.yml
@@ -105,8 +105,6 @@ webservers:
         - perso.nintendojo.fr
         - perso.libertus.eu
         - r.mateu.be
-        - z.libertus.eu
-        - autodiscover.libertus.eu
     web2.dmz.mateu.be:
       web_hostname:
         - analyse.nintendojo.fr
diff --git a/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2
deleted file mode 100644
index 7445e4a..0000000
--- a/roles/nginx/templates/vhosts/z.libertus.eu.conf.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-server {
-	listen *:443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name z.libertus.eu autodiscover.libertus.eu;
-	access_log /var/log/nginx/z.libertus.eu.access.log combined;
-	access_log syslog:server=unix:/dev/log combined;
-	error_log /var/log/nginx/z.libertus.eu.error.log;
-	error_log syslog:server=unix:/dev/log;
-
-	ssl_certificate /etc/x509/z.libertus.eu/fullchain.cer;
-	ssl_certificate_key /etc/x509/z.libertus.eu/z.libertus.eu.key;
-
-	root /usr/share/z-push;
-	index index.php;
-
-	client_max_body_size 20M;
-	client_body_buffer_size 128k;
-	keepalive_timeout 90;
-	proxy_read_timeout 1200;
-	sendfile on;
-
-	location / {
-		try_files $uri $uri/ index.php;
-	}
-
-	location /Microsoft-Server-ActiveSync {
-		rewrite ^(.*)$ /index.php last;
-	}
-
-	location ~* ^/autodiscover/autodiscover\.xml$ {
-		rewrite ^(.*)$ /autodiscover/autodiscover.php last;
-	}
-
-	location ~* \.php$ {
-		include fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-		fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock;
-		fastcgi_read_timeout 1200;
-	}
-}
diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml
index 7208623..5859840 100644
--- a/roles/webapps/tasks/main.yml
+++ b/roles/webapps/tasks/main.yml
@@ -3,9 +3,6 @@
 - name: include ttrss for web1
   include_tasks: ttrss.yml
   when: inventory_hostname == 'web1.dmz.mateu.be'
-- name: include z-push
-  include_tasks: z-push.yml
-  when: inventory_hostname == 'web1.dmz.mateu.be'
 - name: include matomo for web2
   include_tasks: matomo.yml
   when: inventory_hostname == 'web2.dmz.mateu.be'
@@ -20,4 +17,4 @@
   when: inventory_hostname == 'ror1.dmz.mateu.be'
 - name: tootctl for mastodon
   include_tasks: tootctl.yml
-  when: inventory_hostname == 'ror1.dmz.mateu.be'
+  when: inventory_hostname in groups['rorservers']
diff --git a/roles/webapps/tasks/z-push.yml b/roles/webapps/tasks/z-push.yml
deleted file mode 100644
index 9ccfa58..0000000
--- a/roles/webapps/tasks/z-push.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-
-- name: install z-push repokey
-  apt_key:
-    url: https://download.kopano.io/zhub/z-push%3A/final/Debian_11/Release.key
-    state: present
-
-- name: install z-push repo
-  apt_repository:
-    repo: deb https://download.kopano.io/zhub/z-push:/final/Debian_11/ /
-    state: present
-
-- name: install z-push packages
-  package:
-    name: "{{ item }}"
-    state: present
-  loop:
-    - z-push-autodiscover
-    - z-push-backend-caldav
-    - z-push-backend-carddav
-    - z-push-backend-combined
-    - z-push-backend-imap
-    - z-push-common
-    - z-push-ipc-sharedmemory
-    - z-push-state-sql
-
-- name: log directory
-  file:
-    path: /var/log/z-push/
-    owner: www-data
-    group: www-data
-    state: directory