diff --git a/dump/dist/clear_resourcedumps_poweroff.service b/dump/dist/clear_resourcedumps_poweroff.service
new file mode 100644
index 0000000..2a0d48a
--- /dev/null
+++ b/dump/dist/clear_resourcedumps_poweroff.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Remove resource dump entries during poweroff
+Wants=obmc-host-stop-pre@0.target
+After=obmc-host-stop-pre@0.target
+Wants=obmc-host-stopping@0.target
+Before=obmc-host-stopping@0.target
+Conflicts=obmc-host-startmin@0.target
+ConditionPathExists=!/run/openbmc/host@0-on
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/dumpdelete com.ibm.Dump.Entry.Resource
+
+RemainAfterExit=yes
+
+[Install]
+#WantedBy=obmc-host-stop@0.target
+
diff --git a/dump/dist/clear_systemdumps_poweroff.service b/dump/dist/clear_systemdumps_poweroff.service
new file mode 100644
index 0000000..49b1a4a
--- /dev/null
+++ b/dump/dist/clear_systemdumps_poweroff.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Remove system dump entries during poweroff
+Wants=obmc-host-stop-pre@0.target
+After=obmc-host-stop-pre@0.target
+Wants=obmc-host-stopping@0.target
+Before=obmc-host-stopping@0.target
+After=op-enter-mpreboot@0.service
+Conflicts=obmc-host-startmin@0.target
+ConditionPathExists=!/run/openbmc/host@0-on
+ConditionPathExists=!/run/openbmc/mpreboot@0
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/dumpdelete xyz.openbmc_project.Dump.Entry.System
+
+RemainAfterExit=yes
+
+[Install]
+#WantedBy=obmc-host-stop@0.target
+
diff --git a/dump/dist/meson.build b/dump/dist/meson.build
index 7081dd9..1e88be0 100644
--- a/dump/dist/meson.build
+++ b/dump/dist/meson.build
@@ -17,6 +17,22 @@
     install_dir: systemd_system_unit_dir,
 )
 
+configure_file(
+    input: 'clear_systemdumps_poweroff.service',
+    output: 'clear_systemdumps_poweroff.service',
+    configuration: dist_conf_data,
+    install: true,
+    install_dir: systemd_system_unit_dir,
+)
+
+configure_file(
+    input: 'clear_resourcedumps_poweroff.service',
+    output: 'clear_resourcedumps_poweroff.service',
+    configuration: dist_conf_data,
+    install: true,
+    install_dir: systemd_system_unit_dir,
+)
+
 # Symlinks for services
 systemd_alias = [
     [
@@ -25,6 +41,20 @@
     ],
 ]
 
+systemd_alias += [
+    [
+        '../clear_systemdumps_poweroff.service',
+        'obmc-host-stop@0.target.wants/clear_systemdumps_poweroff.service',
+    ],
+]
+
+systemd_alias += [
+    [
+        '../clear_resourcedumps_poweroff.service',
+        'obmc-host-stop@0.target.wants/clear_resourcedumps_poweroff.service',
+    ],
+]
+
 foreach service : systemd_alias
     meson.add_install_script(
         'sh',