diff --git a/0002-Fix-systemd-units-run-before-poweroff.patch b/0002-Fix-systemd-units-run-before-poweroff.patch
new file mode 100644
index 0000000..5481fdd
--- /dev/null
+++ b/0002-Fix-systemd-units-run-before-poweroff.patch
@@ -0,0 +1,38 @@
+commit 52257aa8a389d681965f51cfbcaa454b75fe92a2 (HEAD -> fix-systemd-dependencies, origin/fix-systemd-dependencies)
+Author: Miguel Martín <mmartinv@redhat.com>
+Date:   Wed Oct 2 09:43:23 2024 +0200
+
+    fix(systemd-units): run before powering off the system
+
+    Run before coreos-installer-poweroff.service and
+    coreos-installer-noreboot.service systemd units.
+
+    Otherwise the coreos-installer-poweroff.service and
+    the manufacturing-client.service are run in parallel
+    and the manufacturing client can be stopped before
+    finishing the manufacturing process.
+
+    Resolves: RHEL-38482
+
+    Signed-off-by: Miguel Martín <mmartinv@redhat.com>
+
+diff --git a/dracut/52fdo/manufacturing-client.service b/dracut/52fdo/manufacturing-client.service
+index 9ce9eacb..53268891 100644
+--- a/dracut/52fdo/manufacturing-client.service
++++ b/dracut/52fdo/manufacturing-client.service
+@@ -3,6 +3,8 @@ Description=Manufacturing client DIUN
+ DefaultDependencies=false
+
+ After=coreos-installer.service
++Before=coreos-installer-poweroff.service
++Before=coreos-installer-noreboot.service
+ Before=coreos-installer-reboot.service
+ ConditionPathExists=/etc/manufacturing-client-config
+ Requires=dev-disk-by\x2dlabel-boot.device
+@@ -15,4 +17,4 @@ Type=oneshot
+ Environment=LOG_LEVEL=info
+ EnvironmentFile=/etc/manufacturing-client-config
+ ExecStart=/usr/libexec/manufacturing-client-service
+-RemainAfterExit=yes
+\ No newline at end of file
++RemainAfterExit=yes
diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec
index 095e311..8374739 100644
--- a/fido-device-onboard.spec
+++ b/fido-device-onboard.spec
@@ -4,7 +4,7 @@
 
 Name:           fido-device-onboard
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A rust implementation of the FIDO Device Onboard Specification
 License:        BSD-3-Clause
 
@@ -13,6 +13,7 @@ Source0:        %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz
 # See make-vendored-tarfile.sh in upstream repo
 Source1:        %{name}-rs-%{version}-vendor-patched.tar.xz
 Patch1:         0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch
+Patch2:         0002-Fix-systemd-units-run-before-poweroff.patch
 
 # Because nobody cares
 ExcludeArch: %{ix86}
@@ -282,6 +283,9 @@ Requires: fdo-init = %{version}-%{release}
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Wed Oct 02 2024 Miguel Martín <mmartinv@redhat.com> - 0.5.0-3
+- Backport https://github.com/fdo-rs/fido-device-onboard-rs/pull/676
+
 * Wed Feb 28 2024 Irene Diez <idiez@redhat.com> - 0.5.0-2
 - Update license