diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait-until-removed@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait-until-removed@.service
new file mode 100644
index 0000000..1dd0124
--- /dev/null
+++ b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait-until-removed@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Wait for %I to be removed
+Wants=obmc-mapper.target
+After=obmc-mapper.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Restart=no
+ExecStart={sbindir}/mapper wait-until-removed %I