diff --git a/service_files/xyz.openbmc_project.EntityManager.service b/service_files/xyz.openbmc_project.EntityManager.service
new file mode 100644
index 0000000..aca242a
--- /dev/null
+++ b/service_files/xyz.openbmc_project.EntityManager.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Entity Manager
+Wants=mapper-wait@-xyz-openbmc_project-FruDevice.service
+After=mapper-wait@-xyz-openbmc_project-FruDevice.service
+ConditionFileNotEmpty={bindir}/entity-manager
+
+[Service]
+ExecStartPre=/bin/mkdir -p /var/configuration
+ExecStartPre=/bin/mkdir -p /tmp/overlays
+ExecStart=/usr/sbin/entity-manager
+Restart=always
+Type=simple
+
+[Install]
+WantedBy=basic.target
diff --git a/service_files/xyz.openbmc_project.FruDevice.service b/service_files/xyz.openbmc_project.FruDevice.service
new file mode 100644
index 0000000..7d69c31
--- /dev/null
+++ b/service_files/xyz.openbmc_project.FruDevice.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Fru Device
+ConditionFileNotEmpty={bindir}/fru-device
+StopWhenUnneeded=true
+After=xyz.openbmc_project.CloseMuxes.service dbus.service
+
+[Service]
+ExecStart=/usr/sbin/fru-device
+Type=oneshot
+
+[Install]
+WantedBy=basic.target