diff --git a/scripts/remove b/scripts/remove
index 69a9280..7619b15 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,7 +43,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
 
-ynh_exec_warn_less nomad node drain -self -enable
+ynh_exec_warn_less timeout 25 nomad node drain -self -enable -yes -deadline 20s
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
@@ -81,7 +81,7 @@ fi
 
 if [ "$node_type" == "client" ]
 then
-	
+
 	if [ $driver_lxc -eq 1 ]
 	then
 		client_lxc_bridge=$(ynh_app_setting_get --app=$app --key=client_lxc_bridge)