Rework discovery compose setup & discovery service commands (#1432)