diff --git a/infra/modules/dns/outputs.tf b/infra/modules/dns/outputs.tf
index 2d2daea89..0cf18939d 100644
--- a/infra/modules/dns/outputs.tf
+++ b/infra/modules/dns/outputs.tf
@@ -8,17 +8,17 @@ output "grafana_fqdn" {
   value       = "${scaleway_domain_record.grafana.name}.${scaleway_domain_record.grafana.dns_zone}"
 }
 
-output "prometheus_fqdn" {
-  description = "FQDN for the Prometheus instance"
-  value       = "${scaleway_domain_record.prometheus.name}.${scaleway_domain_record.prometheus.dns_zone}"
-}
-
 output "api_fqdn" {
   description = "FQDN for the API Gateway (gRPC)"
   value       = "${scaleway_domain_record.api.name}.${scaleway_domain_record.api.dns_zone}"
 }
 
-output "monitor_fqdn" {
-  description = "FQDN for the Monitoring Service (gRPC)"
-  value       = "${scaleway_domain_record.monitor.name}.${scaleway_domain_record.monitor.dns_zone}"
+output "chat_fqdn" {
+  description = "FQDN for the Mattermost chat"
+  value       = "${scaleway_domain_record.chat.name}.${scaleway_domain_record.chat.dns_zone}"
+}
+
+output "mail_fqdn" {
+  description = "FQDN for the Stalwart mail server"
+  value       = "${scaleway_domain_record.mail.name}.${scaleway_domain_record.mail.dns_zone}"
 }