diff --git a/spec_files/jupiter-hw-support/bazzite-btrfs.patch b/spec_files/jupiter-hw-support/bazzite-btrfs.patch
index ff933cd8..ff24a31a 100644
--- a/spec_files/jupiter-hw-support/bazzite-btrfs.patch
+++ b/spec_files/jupiter-hw-support/bazzite-btrfs.patch
@@ -7,9 +7,9 @@ index dd700da..152e231 100644
  Type=oneshot
  RemainAfterExit=true
 +EnvironmentFile=/etc/default/steamos-btrfs
- ExecStart=/usr/sbin/steamos-automount add %i
- ExecStop=/usr/sbin/steamos-automount remove %i
- ExecReload=/usr/sbin/steamos-automount retrigger %i
+ ExecStart=/usr/libexec/steamos-automount add %i
+ ExecStop=/usr/libexec/steamos-automount remove %i
+ ExecReload=/usr/libexec/steamos-automount retrigger %i
 diff --git a/usr/lib/hwsupport/format-device.sh b/usr/lib/hwsupport/format-device.sh
 index b136413..d3cbb16 100755
 --- a/usr/lib/hwsupport/format-device.sh
diff --git a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
index fd1531da..48a7aff3 100644
--- a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
+++ b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec
@@ -48,21 +48,16 @@ export QA_RPATHS=0x0003
 mkdir -p %{buildroot}%{_datadir}/
 mkdir -p %{buildroot}%{_unitdir}/
 mkdir -p %{buildroot}%{_bindir}/
-mkdir -p %{buildroot}%{_sbindir}/
+mkdir -p %{buildroot}%{_libexecdir}/
 mkdir -p %{buildroot}%{_sysconfdir}/
 mkdir -p %{buildroot}%{_prefix}/lib/hwsupport/
 cp -rv usr/share/* %{buildroot}%{_datadir}
 cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/
-cp usr/lib/hwsupport/cs35l41-dsp1-spk-prot.bin.mod %{buildroot}%{_prefix}/lib/hwsupport/cs35l41-dsp1-spk-prot.bin.mod
-cp usr/lib/hwsupport/cs35l41-dsp1-spk-prot.bin.orig %{buildroot}%{_prefix}/lib/hwsupport/cs35l41-dsp1-spk-prot.bin.orig
 cp usr/lib/hwsupport/power-button-handler.py %{buildroot}%{_prefix}/lib/hwsupport/power-button-handler.py
-cp usr/lib/hwsupport/cirrus-fixup.sh %{buildroot}%{_sbindir}/cirrus-fixup
-cp usr/lib/hwsupport/ev2_cirrus_alsa_fixups.sh %{buildroot}%{_sbindir}/ev2_cirrus_alsa_fixups
-cp usr/lib/hwsupport/format-device.sh %{buildroot}%{_sbindir}/format-device
-cp usr/lib/hwsupport/format-sdcard.sh %{buildroot}%{_sbindir}/format-sdcard
-cp usr/lib/hwsupport/jupiter-amp-control %{buildroot}%{_sbindir}/jupiter-amp-control
-cp usr/lib/hwsupport/steamos-automount.sh %{buildroot}%{_sbindir}/steamos-automount
-cp usr/lib/hwsupport/trim-devices.sh %{buildroot}%{_sbindir}/trim-devices
+cp usr/lib/hwsupport/format-device.sh %{buildroot}%{_libexecdir}/format-device
+cp usr/lib/hwsupport/format-sdcard.sh %{buildroot}%{_libexecdir}/format-sdcard
+cp usr/lib/hwsupport/steamos-automount.sh %{buildroot}%{_libexecdir}/steamos-automount
+cp usr/lib/hwsupport/trim-devices.sh %{buildroot}%{_libexecdir}/trim-devices
 cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev
 cp -rv usr/bin/* %{buildroot}%{_bindir}
 cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}
@@ -103,13 +98,10 @@ rm -rf %{buildroot}%{_datadir}/alsa
 %{_bindir}/thumbstick_cal
 %{_bindir}/thumbstick_fine_cal
 %{_bindir}/trigger_cal
-%{_sbindir}/cirrus-fixup
-%{_sbindir}/ev2_cirrus_alsa_fixups
-%{_sbindir}/format-device
-%{_sbindir}/format-sdcard
-%{_sbindir}/jupiter-amp-control
-%{_sbindir}/steamos-automount
-%{_sbindir}/trim-devices
+%{_libexecdir}/format-device
+%{_libexecdir}/format-sdcard
+%{_libexecdir}/steamos-automount
+%{_libexecdir}/trim-devices
 %{_prefix}/lib/hwsupport/*
 %{_prefix}/lib/systemd/system/*
 %{_prefix}/lib/udev/rules.d/*