diff --git a/stage4/98-default-wallpaper/00-run.sh b/stage4/98-default-wallpaper/00-run.sh
new file mode 100644
index 0000000..b3393b5
--- /dev/null
+++ b/stage4/98-default-wallpaper/00-run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+echo "Setting default wallpaper"
+for conf in "${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-"*.conf; do
+  sed -E 's|/usr/share/rpd-wallpaper/.+$|/usr/share/rpd-wallpaper/RPiSystem.png|' -i "$conf"
+done
diff --git a/stage4/99-force-hdmi-1/00-run.sh b/stage4/99-force-hdmi-2/00-run.sh
similarity index 51%
rename from stage4/99-force-hdmi-1/00-run.sh
rename to stage4/99-force-hdmi-2/00-run.sh
index 253f0fb..0a63ad2 100755
--- a/stage4/99-force-hdmi-1/00-run.sh
+++ b/stage4/99-force-hdmi-2/00-run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -e
 
 echo "Setting custom cmdline"
-sed -i 's/$/ video=HDMI-A-1:1920x1080M@60/' "${ROOTFS_DIR}/boot/firmware/cmdline.txt"
+sed -i 's/$/ video=HDMI-A-2:1920x1080M@60/' "${ROOTFS_DIR}/boot/firmware/cmdline.txt"