diff --git a/distrobox-ephemeral b/distrobox-ephemeral
index a423ad0da2..873da3f87c 100755
--- a/distrobox-ephemeral
+++ b/distrobox-ephemeral
@@ -37,7 +37,7 @@ if [ -n "${SUDO_USER}" ] || [ -n "${DOAS_USER}" ]; then
 	exit 1
 fi
 
-trap cleanup TERM INT HUP EXIT
+trap cleanup TERM INT HUP
 
 name=$(mktemp -u distrobox-XXXXXXXXXX)
 container_command=""
@@ -215,4 +215,6 @@ eval ${cmd}
 "${distrobox_path}"/distrobox-enter ${extra_flags} "${name}" ${container_command}
 exit_code="$?"
 
+cleanup
+
 exit "${exit_code}"
diff --git a/distrobox-init b/distrobox-init
index a3c8676c43..9259536079 100755
--- a/distrobox-init
+++ b/distrobox-init
@@ -1490,7 +1490,7 @@ if [ "${nvidia}" -eq 1 ]; then
 	for nvidia_file in ${NVIDIA_FILES}; do
 		dest_file="$(printf "%s" "${nvidia_file}" | sed 's|/run/host||g')"
 
-        mount_bind "${nvidia_file}" "${dest_file}" ro
+		mount_bind "${nvidia_file}" "${dest_file}" ro
 	done
 
 	NVIDIA_DIRS="$(find /run/host/etc /run/host/usr -iname "*nvidia*" -type d || :)"
diff --git a/docs/README.md b/docs/README.md
index bde4b549a0..c8a0f1a2fd 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -16,7 +16,8 @@ current logo credits [David Lapshin](https://github.com/daudix-UFO)<sub>
 Use any Linux distribution inside your terminal. Enable both backward and forward
 compatibility with software and freedom to use whatever distribution you’re more
 comfortable with.
-Distrobox uses `podman`, `docker` or [`lilipod`](https://github.com/89luca89/lilipod) to create containers using the Linux distribution
+Distrobox uses `podman`, `docker` or
+[`lilipod`](https://github.com/89luca89/lilipod) to create containers using the Linux distribution
 of your choice.
 The created container will be tightly integrated with the host, allowing sharing
 of the HOME directory of the user, external storage, external USB devices and