diff --git a/pillar/observability/prometheus.sls b/pillar/observability/prometheus.sls
index ee064f4..9eb45d4 100644
--- a/pillar/observability/prometheus.sls
+++ b/pillar/observability/prometheus.sls
@@ -1,62 +1,69 @@
 #   -------------------------------------------------------------
 #   Salt configuration for Nasqueron servers
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   License:        Trivial work, not eligible to copyright
 #   Description:    Prometheus configuraiton
 #   -------------------------------------------------------------
 
 #   -------------------------------------------------------------
 #   Scrape jobs
 #
 #   Options supported from Prometheus scrape_config syntax:
 #       - name
 #       - scheme
 #       - metrics_path
 #
 #   Options mapped with pillar/services/table.sls for services:
 #       - services_targets: list of services dictionaries
 #         - service: name in nasqueron_services pillar
 #         - port
 #
 #       - services_targets_list will have the same behavior
 #         but will read a list of services in nasqueron_services
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 prometheus_scrape_jobs:
   prometheus_itself:
     name: prometheus
     services_targets:
       - service: prometheus
         port: 9090
 
   node_exporter:
    name: node
    services_targets_list:
       - service: "all"
         port: 9100
 
+  dovecot:
+    name: dovecot
+    scheme: http
+    services_targets:
+      - service: "mail:dovecot:exporter"
+        port: 9900
+
   netbox:
     name: netbox
     scheme: https
     services_targets:
       - service: netbox_domain
         port: 443
 
   paas_docker:
     name: docker
     services_targets_list:
       - service: "docker:all"
         port: 9323
 
   postfix:
     name: postfix
     services_targets:
       - service: "mail:postfix:exporter"
         port: 9154
 
   rabbitmq:
     name: rabbitmq
     services_targets:
       - service: "rabbitmq:white-rabbit"
         port: 15692
diff --git a/pillar/services/table.sls b/pillar/services/table.sls
index 89fd570..455decf 100644
--- a/pillar/services/table.sls
+++ b/pillar/services/table.sls
@@ -1,54 +1,56 @@
 #   -------------------------------------------------------------
 #   Salt configuration for Nasqueron servers
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   License:        Trivial work, not eligible to copyright
 #   Description:    Table of the services to use in configuration
 #   -------------------------------------------------------------
 
 nasqueron_services:
   # Complector services
   salt_primary: 172.27.27.7
   salt_api_url: https://172.27.27.7:8300
 
   vault: 172.27.27.7
   vault_url: https://172.27.27.7:8200
 
   # PaaS Docker
   docker:
     api: 172.27.27.5
     cd: 172.27.27.5
     notifications: 172.27.27.5
     all:
       - 172.27.27.4
       - 172.27.27.5
 
   # Databases
   db-A: 172.27.27.8
   db-B: 172.27.27.9
 
   # Mail
   mail:
+    dovecot:
+      exporter: 172.27.27.3
     postfix:
       exporter: 172.27.27.3
 
   # NetBox
   netbox_domain: netbox.nasqueron.org
 
   # RabbitMQ
   rabbitmq:
     white-rabbit: 172.27.27.5
 
   # Observability
   prometheus: 172.27.27.35
 
   all:
     - 172.27.27.1 # router-001
     - 172.27.27.3 # hervil
     - 172.27.27.4 # dwellers
     - 172.27.27.5 # docker-002
     - 172.27.27.7 # complector
     - 172.27.27.8 # db-A-001
     - 172.27.27.9 # db-B-001
     - 172.27.27.10 # web-001
     - 172.27.27.35 # windriver