diff --git a/toolbox b/toolbox
index 14c90b5..46fe4e5 100755
--- a/toolbox
+++ b/toolbox
@@ -47,7 +47,7 @@
 machinename=$(echo "${USER}-${TOOLBOX_DOCKER_IMAGE}-${TOOLBOX_DOCKER_TAG}" | sed -r 's/[^a-zA-Z0-9_.-]/_/g')
 machinepath="${TOOLBOX_DIRECTORY}/${machinename}"
 osrelease="${machinepath}/etc/os-release"
-if [ ! -f ${osrelease} ] || systemctl is-failed -q ${machinename} ; then
+if [ ! -f ${osrelease} ] ; then
 	sudo mkdir -p "${machinepath}"
 	sudo mkdir -p "${TOOLBOX_TEMP_DIR}"
 	sudo chown ${USER}: "${machinepath}"
@@ -70,11 +70,15 @@
 		fi
 		sudo ctr image pull "${user_flags[@]}" "${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}"
 	fi
-	sudo ctr containers create "${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}" ${machinename} /bin/true
-	sudo ctr snapshot mounts "${TOOLBOX_TEMP_DIR}" ${machinename} | xargs sudo
+	# The below command is finding the short SHA256 prefix of the container
+	# image.
+	container256hash=$(sudo ctr image ls | grep "${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}" | awk '{ print $3 }' | cut -d':' -f2 | cut -c-12)
+	containername=$(echo "${USER}-${container256hash}" | sed -r 's/[^a-zA-Z0-9_.-]/_/g')
+	sudo ctr containers create "${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}" ${containername} /bin/true
+	sudo ctr snapshot mounts "${TOOLBOX_TEMP_DIR}" ${containername} | xargs sudo
 	sudo rsync -a "${TOOLBOX_TEMP_DIR}/" "${machinepath}"
 	sudo umount "${TOOLBOX_TEMP_DIR}"
-	sudo ctr container rm ${machinename}
+	sudo ctr container rm ${containername}
 	sudo rm -rf "${TOOLBOX_TEMP_DIR}"
 	sudo touch ${osrelease}
 fi