diff --git a/scripts/gx-teaching b/scripts/gx-teaching
index 163f567..4551ca2 100755
--- a/scripts/gx-teaching
+++ b/scripts/gx-teaching
@@ -3,6 +3,7 @@
 
 # Set defaults
 BASEDIR="$(pwd)"
+BASEHASH="$(echo "$BASEDIR" |sha256sum |head -c7)"
 ACTION="watch"
 VERBOSITY="0"
 DOCKER_IMAGE=glenux/teaching-boilerplate:latest
@@ -104,7 +105,17 @@ fi
 if [ "$VERBOSITY" -gt 0 ]; then
 	set -x
 fi
+
+DOCKER_NAME="gx-teaching-$BASEHASH"
+DOCKER_CID="$(docker ps -f "name=$DOCKER_NAME" -q)"
+
+if [ -n "$DOCKER_CID" ]; then
+	docker kill "$DOCKER_NAME"
+fi
+
 docker run -i $DOCKER_OPT_TTY \
+	--name "$DOCKER_NAME" \
+	--rm \
 	--shm-size=1gb \
 	-e "EXT_UID=$(id -u)" \
 	-e "EXT_GID=$(id -g)" \