diff --git a/raspi0w.yaml b/raspi0w.yaml
index 9c697d3..e0759b2 100644
--- a/raspi0w.yaml
+++ b/raspi0w.yaml
@@ -90,7 +90,7 @@ steps:
       echo "rpi-z" > "${ROOT?}/etc/hostname"
 
       # Allow root logins with no password
-      sed -i 's,root:[^:]*:,root::' "${ROOT?}/etc/shadow"
+      sed -i 's,root:[^:]*:,root::,' "${ROOT?}/etc/shadow"
 
       install -m 644 -o root -g root fstab "${ROOT?}/etc/fstab"
 
diff --git a/raspi3.yaml b/raspi3.yaml
index cee9d9e..503704a 100644
--- a/raspi3.yaml
+++ b/raspi3.yaml
@@ -87,7 +87,7 @@ steps:
     unless: rootfs_unpacked
 
   - shell: |
-      echo "rpi" > "${ROOT?}/etc/hostname"
+      echo "rpi3" > "${ROOT?}/etc/hostname"
 
       # Allow root logins with no password
       sed -i 's,root:[^:]*:,root::,' "${ROOT?}/etc/shadow"