diff --git a/tasks/main.yml b/tasks/main.yml
index 8750c60..dc9ae69 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,6 @@
 ---
 # tasks file for ansible-arch-provissionninga
 #
-- name: debug
-  debug:
-    msg: "{% if provissionning_UEFI_Enable == True %} GPT {% else %} msdos {% endif %}"
 - name: Abort if the host is not booted from the Arch install media
   fail:
     msg: "This host {{ ansible_nodename }} is not booted from the Arch install media!"
@@ -118,12 +115,12 @@
     line: "PermitRootLogin yes" 
     state: present
 - name: change root password
-  user:
-    name: root
-    password: "{{ vault_default_root |password_hash('sha512') }}"
+  shell:
+    cmd: "echo 'root:{{ vault_default_root | password_hash('sha512')}}' |arch-chroot /mnt chpasswd -e"
   when: vault_default_root is defined
 - name: Reboot
   reboot:
-    connect_timeout: 1
-    reboot_timeout: 1
-  failed_when: false
+      msg: reboot in new system
+      reboot_timeout: 60
+  ignore_errors: yes
+