diff --git a/Makefile b/Makefile
index 53c076b9a..10c052ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,10 @@ release:
 
 .PHONY: %-shell
 %-shell:
-	@echo "TODO: build specified container, run it and drop into bash"
-	exit 1
+	MOUNT_DIR=/mnt/fradrive ; \
+	FRADRIVE_SERVICE=$* ; \
+	$(MAKE) -- --image-build FRADRIVE_SERVICE=$${FRADRIVE_SERVICE} ; \
+	$(CONTAINER_COMMAND) run -it -v $(PWD):$${MOUNT_DIR} $(CONTAINER_PORTS) --env IN_CONTAINER=true --entrypoint /bin/bash --name fradrive.$${FRADRIVE_SERVICE}.interactive.$$(date +'%Y-%m-%dT%H-%M-%S') fradrive/$${FRADRIVE_SERVICE}
 
 ##### GENERAL TARGETS #####
 ###########################