diff --git a/service_files/meson.build b/service_files/meson.build
index 18dfa47..71bc72e 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -9,7 +9,8 @@
     'xyz.openbmc_project.State.BMC.service',
     'xyz.openbmc_project.State.Chassis.service',
     'xyz.openbmc_project.State.Host.service',
-    'xyz.openbmc_project.State.ScheduledHostTransition.service'
+    'xyz.openbmc_project.State.ScheduledHostTransition.service',
+    'phosphor-clear-one-time@.service'
 ]
 
 foreach u : unit_files
diff --git a/service_files/phosphor-clear-one-time@.service b/service_files/phosphor-clear-one-time@.service
new file mode 100644
index 0000000..b0bf529
--- /dev/null
+++ b/service_files/phosphor-clear-one-time@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Reset one-time properties on chassis off
+Wants=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot-one_time.service
+After=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot-one_time.service
+
+[Service]
+Restart=no
+Type=oneshot
+ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/control/host%i/auto_reboot/one_time` /xyz/openbmc_project/control/host%i/auto_reboot/one_time xyz.openbmc_project.Control.Boot.RebootPolicy AutoReboot b true"
+
+[Install]
+WantedBy=obmc-chassis-poweroff@%i.target