diff --git a/COPY/usr/bin/manageiq-podman-cleanup b/COPY/usr/bin/manageiq-podman-cleanup
new file mode 100755
index 0000000..8e22aa3
--- /dev/null
+++ b/COPY/usr/bin/manageiq-podman-cleanup
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+manageiq_uid=$(id -u manageiq)
+podman_tmpdir=/tmp/storage-run-${manageiq_uid}
+
+if [ -d ${podman_tmpdir} ]
+then
+  /bin/rm -rf ${podman_tmpdir}
+fi
diff --git a/COPY/usr/lib/systemd/system/manageiq-podman-cleanup.service b/COPY/usr/lib/systemd/system/manageiq-podman-cleanup.service
new file mode 100644
index 0000000..7d5907d
--- /dev/null
+++ b/COPY/usr/lib/systemd/system/manageiq-podman-cleanup.service
@@ -0,0 +1,10 @@
+[Unit]
+Description="Podman Initialization"
+After=syslog.target
+
+[Service]
+ExecStart=/bin/manageiq-podman-cleanup
+Type=oneshot
+
+[Install]
+WantedBy=multi-user.target