diff --git a/conf/default_ports.conf b/conf/default_ports.conf
index ba0fdc7..a72d902 100644
--- a/conf/default_ports.conf
+++ b/conf/default_ports.conf
@@ -49,10 +49,16 @@ standard_ipsec_nat_t=4500
 standard_http_ports="80,443"
 standard_mailuser_ports="587,465,110,995,143,993"
 
+# - Dovecot Service
+# -
+dovecot_external_auth_port="44444"
+
 # - Jitsi Video Conference Service
 # -
 standard_jitsi_tcp_ports="$standard_http_ports"
 standard_jitsi_udp_port_range="10000:20000"
+default_jitsi_dovecout_auth_port="$dovecot_external_auth_port"
+
 
 # - TURN Server (Stun Server) (for Nextcloud 'talk' app)
 # -
diff --git a/conf/main_ipv4.conf.sample b/conf/main_ipv4.conf.sample
index f3dff5d..e2d2943 100644
--- a/conf/main_ipv4.conf.sample
+++ b/conf/main_ipv4.conf.sample
@@ -321,7 +321,7 @@ dovecot_auth_service=false
 
 # - Port listen for dovecot auth requests
 # -
-dovecot_auth_port=44444
+dovecot_auth_port="$dovecot_external_auth_port"
 
 # - Client Network(s) allowed to connect to dovecot's auth service
 # -
@@ -401,7 +401,7 @@ jitsi_udp_ports_out="$standard_http_ports,$standard_turn_service_ports,4443,4444
 # -
 jitsi_dovecot_auth=false
 jitsi_dovecot_host=""
-jitsi_dovecot_port="444444"
+jitsi_dovecot_port="$default_jitsi_dovecout_auth_port"
 
 
 # - TURN Server (Stun Server) (for Nextcloud 'talk' app)
diff --git a/conf/main_ipv6.conf.sample b/conf/main_ipv6.conf.sample
index 6760006..82fb149 100644
--- a/conf/main_ipv6.conf.sample
+++ b/conf/main_ipv6.conf.sample
@@ -337,7 +337,7 @@ dovecot_auth_service=false
 
 # - Port listen for dovecot auth requests
 # -
-dovecot_auth_port=44444
+dovecot_auth_port="$dovecot_external_auth_port"
 
 # - Client Network(s) allowed to connect to dovecot's auth service
 # -
@@ -420,7 +420,7 @@ jitsi_udp_ports_out="$standard_http_ports,$standard_turn_service_ports,4443,4444
 # -
 jitsi_dovecot_auth=false
 jitsi_dovecot_host=""
-jitsi_dovecot_port="444444"
+jitsi_dovecot_port="$default_jitsi_dovecout_auth_port"
 
 
 # - TURN Server (Stun Server) (for Nextcloud 'talk' app)