diff --git a/reform2-imx8mq/mkuserland.sh b/reform2-imx8mq/mkuserland.sh
index 742e596e7eac0f00ef03272140cb07b461a5b7a3..4046b8e6b35c4dfdd7310fa34a784f7e76a34b88 100755
--- a/reform2-imx8mq/mkuserland.sh
+++ b/reform2-imx8mq/mkuserland.sh
@@ -22,16 +22,22 @@ cp $ETC/asound.state target-userland/var/lib/alsa/
 # populate root user and skel
 cp -RavT $SKEL target-userland/root/
 cp -RavT $SKEL target-userland/etc/skel/
+mkdir -p target-userland/etc/skel/Desktop
+mkdir -p target-userland/etc/skel/Documents
+mkdir -p target-userland/etc/skel/Downloads
+mkdir -p target-userland/etc/skel/Music
+mkdir -p target-userland/etc/skel/Pictures
+mkdir -p target-userland/etc/skel/Videos
 
 # populate /etc
 cp $ETC/ld.so.conf target-userland/etc # or our libraries won't be picked up
 cp $ETC/resolv.conf target-userland/etc
 mkdir -p target-userland/etc/dhcp
 cp $ETC/dhclient.conf target-userland/etc/dhcp
-cp $ETC/motd* target-userland/etc
-cp $ETC/reform* target-userland/etc
+cp $ETC/motd target-userland/etc
 cp $ETC/hostname target-userland/etc
 cp $ETC/hosts target-userland/etc
+cp $ETC/reform-* target-userland/etc
 
 # copy pulse config files that will be moved inside the target fs later
 cp $ETC/pulse/* target-userland/
@@ -80,6 +86,10 @@ apt install -y sway grim slurp xwayland xterm xfce4-terminal rofi arc-theme thun
 mv /analog-input-reform.conf /usr/share/pulseaudio/alsa-mixer/paths/
 mv /default.conf /usr/share/pulseaudio/alsa-mixer/profile-sets/
 
+# move hardware setup one-shot service in place
+mv /etc/reform-hw-setup.service /etc/systemd/system/
+systemctl enable reform-hw-setup.service
+
 # install applications
 
 apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker