diff --git a/Makefile b/Makefile
index 212e6bbf..1af8d380 100644
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,26 @@ linkcheck-docs: ## check broken links
 
 hook/%: VARIANT?=default
 hook/%: ## run post-build hooks for an image
-	python3 -m tagging.write_tags_file --short-image-name "$(notdir $@)" --tags-dir /tmp/jupyter/tags/ --registry "$(REGISTRY)" --owner "$(OWNER)" --variant "$(VARIANT)" && \
-	python3 -m tagging.write_manifest --short-image-name "$(notdir $@)" --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/ --registry "$(REGISTRY)" --owner "$(OWNER)" --variant "$(VARIANT)" && \
-	python3 -m tagging.apply_tags --short-image-name "$(notdir $@)" --tags-dir /tmp/jupyter/tags/ --platform "$(shell uname -m)" --registry "$(REGISTRY)" --owner "$(OWNER)" --variant "$(VARIANT)"
+	python3 -m tagging.write_tags_file \
+	  --short-image-name "$(notdir $@)" \
+	  --tags-dir /tmp/jupyter/tags/ \
+	  --registry "$(REGISTRY)" \
+	  --owner "$(OWNER)" \
+	  --variant "$(VARIANT)"
+	python3 -m tagging.write_manifest \
+	  --short-image-name "$(notdir $@)" \
+	  --hist-lines-dir /tmp/jupyter/hist_lines/ \
+	  --manifests-dir /tmp/jupyter/manifests/ \
+	  --registry "$(REGISTRY)" \
+	  --owner "$(OWNER)" \
+	  --variant "$(VARIANT)"
+	python3 -m tagging.apply_tags \
+	  --short-image-name "$(notdir $@)" \
+	  --tags-dir /tmp/jupyter/tags/ \
+	  --platform "$(shell uname -m)" \
+	  --registry "$(REGISTRY)" \
+	  --owner "$(OWNER)" \
+	  --variant "$(VARIANT)"
 hook-all: $(foreach I, $(ALL_IMAGES), hook/$(I)) ## run post-build hooks for all images
 
 
@@ -117,5 +134,8 @@ run-sudo-shell/%: ## run bash in interactive mode as root in a stack
 
 
 test/%: ## run tests against a stack
-	python3 -m tests.run_tests --short-image-name "$(notdir $@)" --registry "$(REGISTRY)" --owner "$(OWNER)"
+	python3 -m tests.run_tests \
+	  --short-image-name "$(notdir $@)" \
+	  --registry "$(REGISTRY)" \
+	  --owner "$(OWNER)"
 test-all: $(foreach I, $(ALL_IMAGES), test/$(I)) ## test all stacks