diff --git a/ocaml/xapi/extauth_plugin_ADwinbind.ml b/ocaml/xapi/extauth_plugin_ADwinbind.ml
index a279de5c5c7..6def6c5bb64 100644
--- a/ocaml/xapi/extauth_plugin_ADwinbind.ml
+++ b/ocaml/xapi/extauth_plugin_ADwinbind.ml
@@ -1434,23 +1434,6 @@ module ConfigHosts = struct
     |> write_string_to_file path
 end
 
-module ResolveConfig = struct
-  let path = "/etc/resolv.conf"
-
-  type t = Add | Remove
-
-  let handle op domain =
-    let open Xapi_stdext_unix.Unixext in
-    let config = Printf.sprintf "search %s" domain in
-    read_lines ~path |> List.filter (fun x -> x <> config) |> fun x ->
-    (match op with Add -> config :: x | Remove -> x) |> fun x ->
-    x @ [""] |> String.concat "\n" |> write_string_to_file path
-
-  let join ~domain = handle Add domain
-
-  let leave ~domain = handle Remove domain
-end
-
 module DNSSync = struct
   let task_name = "Sync hostname with DNS"
 
@@ -1827,7 +1810,11 @@ module AuthADWinbind : Auth_signature.AUTH_MODULE = struct
       ClosestKdc.trigger_update ~start:0. ;
       RotateMachinePassword.trigger_rotate ~start:0. ;
       ConfigHosts.join ~domain:service_name ~name:netbios_name ;
-      ResolveConfig.join ~domain:service_name ;
+      let _, _ =
+        Forkhelpers.execute_command_get_output !Xapi_globs.set_hostname
+          [get_localhost_name ()]
+      in
+      (* Trigger right now *)
       DNSSync.trigger_sync ~start:0. ;
       Winbind.set_machine_account_encryption_type netbios_name ;
       debug "Succeed to join domain %s" service_name
@@ -1836,7 +1823,6 @@ module AuthADWinbind : Auth_signature.AUTH_MODULE = struct
         error "Join domain: %s error: %s" service_name stdout ;
         clear_winbind_config () ;
         ConfigHosts.leave ~domain:service_name ~name:netbios_name ;
-        ResolveConfig.leave ~domain:service_name ;
         (* The configure is kept for debug purpose with max level *)
         raise (Auth_service_error (stdout |> tag_from_err_msg, stdout))
     | Xapi_systemctl.Systemctl_fail _ ->
@@ -1844,7 +1830,6 @@ module AuthADWinbind : Auth_signature.AUTH_MODULE = struct
         error "Start daemon error: %s" msg ;
         config_winbind_daemon ~domain:None ~workgroup:None ~netbios_name:None ;
         ConfigHosts.leave ~domain:service_name ~name:netbios_name ;
-        ResolveConfig.leave ~domain:service_name ;
         raise (Auth_service_error (E_GENERIC, msg))
     | e ->
         let msg =
@@ -1856,7 +1841,6 @@ module AuthADWinbind : Auth_signature.AUTH_MODULE = struct
         error "Enable extauth error: %s" msg ;
         clear_winbind_config () ;
         ConfigHosts.leave ~domain:service_name ~name:netbios_name ;
-        ResolveConfig.leave ~domain:service_name ;
         raise (Auth_service_error (E_GENERIC, msg))
 
   (* unit on_disable()
@@ -1871,7 +1855,6 @@ module AuthADWinbind : Auth_signature.AUTH_MODULE = struct
     let user = List.assoc_opt "user" config_params in
     let pass = List.assoc_opt "pass" config_params in
     let {service_name; netbios_name; _} = get_domain_info_from_db () in
-    ResolveConfig.leave ~domain:service_name ;
     DNSSync.stop_sync () ;
     ( match netbios_name with
     | Some netbios ->