diff --git a/common/recipes-core/systemd/systemd/software.conf b/common/recipes-core/systemd/systemd/software.conf
deleted file mode 100644
index 09ecd92..0000000
--- a/common/recipes-core/systemd/systemd/software.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# /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/common/recipes-core/systemd/systemd_%.bbappend b/common/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index e42259e..0000000
--- a/common/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-inherit obmc-phosphor-utils
-
-SRC_URI += "${@df_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}"
-
-install_tmpfile() {
-        # /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('DISTRO_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)}; then
-                install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/
-        fi
-}
-
-install_tmpfile_df-obmc-ubi-fs() {
-        # 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.
-
-        :
-}
-
-do_install_append() {
-        install_tmpfile
-}