diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index 06be08e6..c62a36f8 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -152,20 +152,11 @@
     ARCHFLAGS: "-arch aarch64"
 
   tasks:
-    - name: "Read a file content"
-      shell: |
-        cat /boot/boot.cmd
-      register: file_content
-
-    - name: "Print the file content to a console"
-      debug:
-        msg: "{{ file_content.stdout }}"
-
-    - name: Create pi user
+    - name: Create user=pi, pass=orange
       copy:
         dest: /boot/userconf
         content: |
-          pi:$6$3jNr0GA9KIyt4hmM$efeVIopdMQ8DGgEPCWWlbx3mJJNAYci1lEXGdlky0xPyjqwKNbwTL5SrCcpb4144C4IvzWjn7Iv.QjqmU7iyT/
+          pi:$6$2f51RQqfvzZaVljt$zNBftBn3LDVjJckR0cA/RdGA3iCshbUvuUUhIOD2uVLnaBazoxHmgiD1a0xAz6gQO4i3rGLzme931bJeNwNyx.
 
     - name: change hostname
       lineinfile:
@@ -407,6 +398,13 @@
         autoremove: yes
       when: removed.changed
 
+    - name: remove ssh keys
+      file:
+        state: absent
+        path: "{{ item }}"
+      with_fileglob:
+        - "/etc/ssh/ssh_host*_key*"
+
   handlers:
     - name: reload systemd services
       systemd:
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index d964dfef..1c45d9bc 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -272,7 +272,7 @@
         state: absent
         path: /usr/lib/firmware/brcm/brcmfmac43436-sdio.clm_blob
 
-    - name: Delete the RPi302w firmware blob to avoid it crashing
+    - name: Delete the RPi02w firmware blob to avoid it crashing
       file:
         state: absent
         path: /usr/lib/firmware/brcm/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob
@@ -573,6 +573,13 @@
         autoremove: yes
       when: removed.changed
 
+    - name: remove ssh keys
+      file:
+        state: absent
+        path: "{{ item }}"
+      with_fileglob:
+          - "/etc/ssh/ssh_host*_key*"
+
   handlers:
     - name: reload systemd services
       systemd: