diff --git a/elements/unmask-tmp/README.rst b/elements/unmask-tmp/README.rst
new file mode 100644
index 0000000..b3040c7
--- /dev/null
+++ b/elements/unmask-tmp/README.rst
@@ -0,0 +1,7 @@
+==========
+unmask-tmp
+==========
+
+Workaround for the issue described `here <https://bugzilla.redhat.com/show_bug.cgi?id=1243494>`_.
+The symptom to lookout for is that the rootfs is mounted read-only. This has also been observed
+on CentOS 8.
diff --git a/elements/unmask-tmp/cleanup.d/99-unmask-tmp b/elements/unmask-tmp/cleanup.d/99-unmask-tmp
new file mode 100755
index 0000000..8d04bd2
--- /dev/null
+++ b/elements/unmask-tmp/cleanup.d/99-unmask-tmp
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "${DIB_DEBUG_TRACE:-1}" -gt 0 ]; then
+    set -x
+fi
+set -u
+set -o pipefail
+
+sudo rm -f $TARGET_ROOT/etc/systemd/system/tmp.mount && echo "Successfully removed etc/systemd/system/tmp.mount" || true