diff --git a/bin/convertdomain b/bin/convertdomain
index 62b753e..e1f5098 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -920,8 +920,26 @@ do_serviceprep
 /federated/bin/stop all &> /dev/null
 
 # Convert each services in SERVICES list
-for i in "${SERVICES[@]}"; do
-  if [ -d "/federated/apps/$i" ]; then
-    convert_$i;
-  fi
-done
+convert_powerdns
+[ -d "/federated/apps/traefik" ] && convert_traefik
+[ -d "/federated/apps/postgresql" ] && convert_postgresql
+[ -d "/federated/apps/ldap" ] && convert_ldap
+[ -d "/federated/apps/mail" ] && convert_mail
+[ -d "/federated/apps/collabora" ] && convert_collabora
+[ -d "/federated/apps/nextcloud" ] && convert_nextcloud
+[ -d "/federated/apps/matrix" ] && convert_matrix
+[ -d "/federated/apps/element" ] && convert_element
+[ -d "/federated/apps/listmonk" ] && convert_listmonk
+[ -d "/federated/apps/vaultwarden" ] && convert_vaultwarden
+[ -d "/federated/apps/panel" ] && convert_panel
+[ -d "/federated/apps/wireguard" ] && convert_wireguard
+[ -d "/federated/apps/jitsi" ] && convert_jitsi
+[ -d "/federated/apps/baserow" ] && convert_baserow
+[ -d "/federated/apps/gitea" ] && convert_gitea
+[ -d "/federated/apps/caddy" ] && convert_caddy
+[ -d "/federated/apps/autodiscover" ] && convert_autodiscover
+[ -d "/federated/apps/castopod" ] && convert_castopod
+[ -d "/federated/apps/wordpress" ] && convert_wordpress
+[ -d "/federated/apps/coturn" ] && convert_coturn
+[ -d "/federated/apps/bookstack" ] && convert_bookstack
+[ -d "/federated/apps/freescout" ] && convert_freescout