diff --git a/systemd/cpi.service.in b/systemd/cpi.service.in
index 3c961c74..f14e7e0d 100644
--- a/systemd/cpi.service.in
+++ b/systemd/cpi.service.in
@@ -7,11 +7,12 @@
 #
 
 [Unit]
-Description=Apply Control Program Identification (CPI)
-DefaultDependencies=no
-Conflicts=shutdown.target
 After=sysinit.target
+Before=shutdown.target
 ConditionPathIsReadWrite=/sys/firmware/cpi
+Conflicts=shutdown.target
+DefaultDependencies=no
+Description=Apply Control Program Identification (CPI)
 
 [Service]
 Type=oneshot