diff --git a/Makefile b/Makefile
index b940eb6..c6708b2 100755
--- a/Makefile
+++ b/Makefile
@@ -233,6 +233,3 @@ docker-push:
 
 docker-pull:
 	env docker pull glenux/teaching-boilerplate:latest
-
-shell:
-	$(SHELL) -c "exec $${SHELL}"
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 1d39912..381d182 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -21,4 +21,9 @@ if [ -d "_build" ]; then
 	chown -R "$EXT_UID:$EXT_GID" _build
 fi
 
-exec gosu "$EXT_UID:$EXT_GID" make "$@"
+if [ "$1" = "shell" ]; then
+	exec bash
+else
+	exec gosu "$EXT_UID:$EXT_GID" make "$@"
+fi
+