diff --git a/ansible/playbooks/wazuh.yml b/ansible/playbooks/wazuh.yml
index 782f550..39d8f5d 100644
--- a/ansible/playbooks/wazuh.yml
+++ b/ansible/playbooks/wazuh.yml
@@ -9,7 +9,6 @@
     wazuh_server: 10.22.10.200
     wazuh_url: https://packages.wazuh.com/4.x/windows
     wazuh_msi: wazuh-agent-4.7.2-1.msi
-    ansible_password: "{{ vm_password }}"
   tasks:
     - name: Wazuh Agent
       tags: 
diff --git a/ansible/roles/win_initial/tasks/initial.yml b/ansible/roles/win_initial/tasks/initial.yml
index 671f92e..8769d9d 100644
--- a/ansible/roles/win_initial/tasks/initial.yml
+++ b/ansible/roles/win_initial/tasks/initial.yml
@@ -1,28 +1,13 @@
 ---
-- name: Password
+- name: wait for connention to VM
+  ansible.builtin.wait_for_connection:
+    delay: 10
+    timeout: 600
+  any_errors_fatal: true
   tags: 
     - password
     - password_check
     - always
-  block:
-    - name: Check for pending password status
-      set_fact:
-        ansible_password: "{{ vm_initial_password }}"
-      run_once: true
-      when: password_status == 'pending' or
-            password_status == 'change'
-
-    - name: Check for finished or change password status
-      set_fact:
-        ansible_password: "{{ vm_password }}"
-      run_once: true
-      when: password_status == 'finished' 
-
-    - name: wait for connention to VM
-      ansible.builtin.wait_for_connection:
-        delay: 10
-        timeout: 600
-      any_errors_fatal: true
 
 - name: Set WinRM to delayed startup
   ansible.windows.win_service:
@@ -30,10 +15,6 @@
     start_mode: delayed
   tags: winrm_delayed
 
-- name: Reboot VMs before continuing
-  win_reboot:
-  tags: never
-
 - name: Remove Local Admin
   tags: 
     - remove_admin
diff --git a/password_gen.sh b/password_gen.sh
old mode 100644
new mode 100755
index d54081c..38aa086
--- a/password_gen.sh
+++ b/password_gen.sh
@@ -10,5 +10,6 @@ for ((i=1;i<=END;i++)); do
     PASSWORD+="${WORD}-" 
 done
 
-PASSWORD+=$RANDOM
+NUMBERS=$(($RANDOM % 10))$(($RANDOM % 10))$(($RANDOM % 10))$(($RANDOM % 10))
+PASSWORD+=$NUMBERS
 printf "$PASSWORD"
\ No newline at end of file