diff --git a/docker/cargo_fmt/Makefile b/docker/cargo_fmt/Makefile
index c9d958d..68bb409 100644
--- a/docker/cargo_fmt/Makefile
+++ b/docker/cargo_fmt/Makefile
@@ -28,9 +28,9 @@ endif
 
 # NOTE: This target will write to folders underneath the git-root
 .PHONY: run
-run:
+run: build
 	docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME)
 
 .PHONY: shell
-shell:
+shell: build
 	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 709b062..9f2b7ba 100644
--- a/docker/organic_build/Makefile
+++ b/docker/organic_build/Makefile
@@ -28,9 +28,9 @@ endif
 
 # NOTE: This target will write to folders underneath the git-root
 .PHONY: run
-run:
+run: build
 	docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)
 
 .PHONY: shell
-shell:
+shell: build
 	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 28649d2..371b661 100644
--- a/docker/organic_test/Makefile
+++ b/docker/organic_test/Makefile
@@ -27,9 +27,9 @@ else
 endif
 
 .PHONY: run
-run:
+run: build
 	docker run --rm --init -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) --no-fail-fast --lib --test test_loader
 
 .PHONY: shell
-shell:
+shell: build
 	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)