diff --git a/bin/convertdomain b/bin/convertdomain
index 31b9e88..38dd326 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -60,7 +60,7 @@ do_serviceprep() {
   fi
   sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/ldap/data/root/convertdomain1.ldif
 }
-convert_powerdns() {
+convert_pdnsmysql() {
   #### Convert PowerDNS pdnsmysql
   echo -ne "\n* Converting pdnsmysql.."
 
@@ -73,7 +73,9 @@ convert_powerdns() {
   start_service_convert "pdnsmysql" "nc -z ${SERVICE_IP} 3306 &> /dev/null"
 
   echo -ne "done."
+}
 
+convert_pdns() {
   #### Convert PowerDNS pdns
   echo -ne "\n* Converting pdns.."
   sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/pdns/docker-compose.yml
@@ -86,7 +88,8 @@ convert_powerdns() {
   start_service_convert "pdns" "nc -z ${SERVICE_IP} 8081 &> /dev/null"
 
   echo -ne "done."
-
+}
+convert_pdnsadmin() {
   #### Convert PowerDNS pdnsadmin
   echo -ne "\n* Converting pdnsadmin.."
 
@@ -921,26 +924,8 @@ do_serviceprep
 /federated/bin/stop all &> /dev/null
 
 # Convert each services in SERVICES list
-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
+for i in "${SERVICES[@]}"; do
+  if [ -d "/federated/apps/$i" ]; then
+    convert_$i
+  fi
+done