diff --git a/defaults/main.yml b/defaults/main.yml
index 7d9d629..2d8673c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -45,3 +45,4 @@ timezone: UTC
 ################################################################################
 zimbra_version: 8.8.15
 
+disable_existing_dns_stub_listener: n
\ No newline at end of file
diff --git a/tasks/configure/dnscache.yml b/tasks/configure/disable_existing_dns_stub_listener.yml
similarity index 77%
rename from tasks/configure/dnscache.yml
rename to tasks/configure/disable_existing_dns_stub_listener.yml
index 55e0211..7376646 100644
--- a/tasks/configure/dnscache.yml
+++ b/tasks/configure/disable_existing_dns_stub_listener.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Deshabilitar resolvedor local
+- name: Disable local resolver
   ansible.builtin.ini_file:
     path: /etc/systemd/resolved.conf
     section: Resolve
@@ -8,20 +8,20 @@
     value: "no"
   register: disable_dns_stub_listener
 
-- name: Destruir enlace simbólico
+- name: Delete symbolic link
   file:
     path: /etc/resolv.conf
     state: absent
   when: disable_dns_stub_listener.changed
 
-- name: Crear enlace simbólico
+- name: Create symbolic link
   file:
     path: /etc/resolv.conf
     src: /run/systemd/resolve/resolv.conf
     state: link
   when: disable_dns_stub_listener.changed
 
-- name: Reiniciar servicio systemd-resolved
+- name: Restart systemd-resolved service
   ansible.builtin.service:
     name: systemd-resolved
     state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 33ee889..862fb26 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,8 +28,8 @@
   when: zimbra_store == 'y'
 - import_tasks: 'configure/mta.yml'
   when: zimbra_mta == 'y'
-- import_tasks: 'configure/dnscache.yml'
-  when: zimbra_dnscache == 'y'
+- import_tasks: 'configure/disable_existing_dns_stub_listener.yml'
+  when: zimbra_dnscache == 'y' and disable_existing_dns_stub_listener == 'y'
 
 #
 # Extras configuration process