diff --git a/docker/cargo_fmt/Makefile b/docker/cargo_fmt/Makefile
index aa6063ca..c9d958d7 100644
--- a/docker/cargo_fmt/Makefile
+++ b/docker/cargo_fmt/Makefile
@@ -33,4 +33,4 @@ run:
 
 .PHONY: shell
 shell:
-	docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)
+	docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME)
diff --git a/docker/organic_build/Makefile b/docker/organic_build/Makefile
index 29990460..709b0622 100644
--- a/docker/organic_build/Makefile
+++ b/docker/organic_build/Makefile
@@ -33,4 +33,4 @@ run:
 
 .PHONY: shell
 shell:
-	docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)
+	docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)
diff --git a/docker/organic_test/Makefile b/docker/organic_test/Makefile
index 39d566a4..28649d2a 100644
--- a/docker/organic_test/Makefile
+++ b/docker/organic_test/Makefile
@@ -32,4 +32,4 @@ run:
 
 .PHONY: shell
 shell:
-	docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)
+	docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME)