diff --git a/build_raspberry_pi.sh b/build_raspberry_pi.sh
index 7b28a06..5047b00 100755
--- a/build_raspberry_pi.sh
+++ b/build_raspberry_pi.sh
@@ -45,8 +45,11 @@ sudo mount /dev/loop0p2 "${BUILD_DIR}"
 sudo mount /dev/loop0p1 "${BUILD_DIR}/boot"
 
 # Copy the (raspberry pi-specific) skeleton files
-sudo rsync -a "${SCRIPT_DIR}/raspberry_pi_skeleton/." "${BUILD_DIR}"
-sudo rsync -a "${SCRIPT_DIR}/kiosk_skeleton/." "${BUILD_DIR}/kiosk_skeleton"
+sudo rsync -rl --exclude ".DS_Store" --exclude "boot" "${SCRIPT_DIR}/raspberry_pi_skeleton/." "${BUILD_DIR}"
+sudo rsync -rl --exclude ".DS_Store" "${SCRIPT_DIR}/kiosk_skeleton/." "${BUILD_DIR}/kiosk_skeleton"
+sudo cp "${SCRIPT_DIR}/raspberry_pi_skeleton/boot/config.txt" "${BUILD_DIR}/boot/config.txt"
+sudo cp "${SCRIPT_DIR}/raspberry_pi_skeleton/boot/ssh" "${BUILD_DIR}/boot/ssh"
+sudo sed -i '$ s/$/ logo.nologo consoleblank=0 loglevel=0 quiet/' "${BUILD_DIR}/boot/cmdline.txt"
 
 # Make fstab read-only
 sed -i 's/vfat    defaults/vfat    ro,defaults/g' "${BUILD_DIR}/etc/fstab"
diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index c40d212..aa550d3 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -91,7 +91,9 @@ apt install -y hyperion
 # Run Hyperion as the 'pi' user
 mkdir -p /etc/systemd/system/hyperiond.service.d
 echo -e "[Service]\nUser=pi\nGroup=pi" > /etc/systemd/system/hyperiond.service.d/override.conf
-chown -R pi:pi /var/lib/hyperion || true
+mkdir -p /var/lib/hyperion
+mkdir -p /etc/hyperion
+chown -R pi:pi /var/lib/hyperion
 chown -R pi:pi /etc/hyperion
 usermod -a -G video pi