diff --git a/Makefile.am b/Makefile.am
index 9b4e251..a93ebc8 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,7 @@
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
 	obmc-flash-bmc-setenv@.service \
+	usr-local.mount \
 	xyz.openbmc_project.Software.BMC.Updater.service \
 	xyz.openbmc_project.Software.Download.service \
 	xyz.openbmc_project.Software.Sync.service \
diff --git a/ubi/Makefile.am.include b/ubi/Makefile.am.include
index f5b834e..51ebf57 100644
--- a/ubi/Makefile.am.include
+++ b/ubi/Makefile.am.include
@@ -14,6 +14,5 @@
 	%reldir%/obmc-flash-bmc-updateubootvars@.service \
 	%reldir%/reboot-guard-disable.service \
 	%reldir%/reboot-guard-enable.service \
-	%reldir%/force-reboot.service \
-	%reldir%/usr-local.mount
+	%reldir%/force-reboot.service
 endif
diff --git a/ubi/usr-local.mount b/usr-local.mount
similarity index 100%
rename from ubi/usr-local.mount
rename to usr-local.mount