diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf
new file mode 100644
index 0000000..09ecd92
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf
@@ -0,0 +1,3 @@
+# /tmp/images is the software image upload directory
+# It should not be deleted if the UBI code update is used.
+x /tmp/images
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..134bab5
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,13 @@
+SRC_URI += "${@mf_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}"
+
+do_install_append() {
+
+        # /tmp/images is the software image upload directory.
+        # It should not be deleted since it is watched by the Image Manager for
+        # new images. Don't install software.conf if obmc-ubi-fs is set since
+        # the bbappend in the meta-phosphor layer already installs if
+        # obmc-ubi-fs is set.
+        if ${@bb.utils.contains('MACHINE_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)} && ! ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', 'true', 'false', d)}; then
+                install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/
+        fi
+}
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/software.conf b/meta-phosphor/common/recipes-core/systemd/systemd/software.conf
new file mode 100644
index 0000000..09ecd92
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/systemd/software.conf
@@ -0,0 +1,3 @@
+# /tmp/images is the software image upload directory
+# It should not be deleted if the UBI code update is used.
+x /tmp/images
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
index dd8cddd..52edfc5 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
@@ -16,6 +16,7 @@
 SRC_URI += "file://0005-dont-return-error-if-unable-to-create-network-namespace.patch"
 SRC_URI += "file://0006-journal-Create-journald-dbus-object.patch"
 SRC_URI += "file://0007-journal-Add-Synchronize-dbus-method.patch"
+SRC_URI += "${@mf_enabled(d, 'obmc-ubi-fs', 'file://software.conf')}"
 
 RRECOMMENDS_${PN} += "obmc-targets"
 FILES_${PN} += "${libdir}/systemd/network/default.network"
@@ -30,4 +31,11 @@
         #TODO Remove after this issue is resolved
         #https://github.com/openbmc/openbmc/issues/152
         ln -s /dev/null ${D}/etc/systemd/system/systemd-hwdb-update.service
+
+        # /tmp/images is the software image upload directory.
+        # It should not be deleted since it is watched by the Image Manager
+        # for new images.
+        if ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', 'true', 'false', d)}; then
+                install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/
+        fi
 }