diff --git a/ignition.changes b/ignition.changes
index 637b395..04fe0a7 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -33,6 +33,7 @@ Mon Feb 27 13:09:37 UTC 2023 - iforster@suse.com
   new Ignition spec version
 - Add 0001-ignore-missing-qemu-blockdev.patch [bsc#1207679] to
   support booting without configuration device on s390x.
+- Move all /usr/libexec contents to %sbindir
 
 -------------------------------------------------------------------
 Tue Aug  2 11:28:11 UTC 2022 - Fabian Vogt <fvogt@suse.com>
diff --git a/ignition.spec b/ignition.spec
index a29ddcf..677de1b 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -116,7 +116,8 @@ install -p -m 0755 grub/* %{buildroot}%{_sysconfdir}/grub.d/
 install -p -m 0644 systemd_suse/*.service %{buildroot}%{_prefix}/lib/systemd/system/
 install -p -m 0644 systemd_suse/ignition-delete-config.service.d/* %{buildroot}%{_prefix}/lib/systemd/system/ignition-delete-config.service.d
 install -d %{buildroot}%{_sbindir}/
-mv %{buildroot}/usr/libexec/ignition-rmcfg %{buildroot}/%{_sbindir}/
+mv %{buildroot}/usr/libexec/* %{buildroot}/%{_sbindir}/
+rmdir %{buildroot}/usr/libexec
 
 %pre
 %service_add_pre ignition-delete-config.service
@@ -172,8 +173,8 @@ fi
 /usr/lib/dracut/modules.d/30ignition
 /usr/lib/dracut/modules.d/30ignition-microos
 /usr/bin/ignition-validate
-/usr/libexec/ignition-apply
 /usr/lib/systemd/system/ignition-delete-config.service
+%{_sbindir}/ignition-apply
 %{_sbindir}/ignition-rmcfg
 %dir %{_unitdir}/ignition-delete-config.service.d
 %{_unitdir}/ignition-delete-config.service.d/ignition-rmcfg-suse.conf