diff --git a/src/systemd/mapper-subtree-remove@.service.in b/src/systemd/mapper-subtree-remove@.service.in
new file mode 100644
index 0000000..c6a224b
--- /dev/null
+++ b/src/systemd/mapper-subtree-remove@.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=mapper subtree-remove %I
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+Restart=on-failure
+TimeoutStartSec=infinity
+ExecStart=@BINDIR@/mapper subtree-remove %I
diff --git a/src/systemd/mapper-wait@.service.in b/src/systemd/mapper-wait@.service.in
new file mode 100644
index 0000000..a3df21f
--- /dev/null
+++ b/src/systemd/mapper-wait@.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wait for %I
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Restart=on-failure
+TimeoutStartSec=infinity
+ExecStart=@BINDIR@/mapper wait %I
diff --git a/src/systemd/xyz.openbmc_project.ObjectMapper.service.in b/src/systemd/xyz.openbmc_project.ObjectMapper.service.in
new file mode 100644
index 0000000..c14ba64
--- /dev/null
+++ b/src/systemd/xyz.openbmc_project.ObjectMapper.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Phosphor DBus Service Discovery Manager
+
+[Service]
+Restart=always
+Type=dbus
+ExecStart=@LIBEXECDIR@/phosphor-objmgr/mapperx
+BusName=xyz.openbmc_project.ObjectMapper
+TimeoutStartSec=300
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-xyz.openbmc_project.ObjectMapper.service