diff --git a/Makefile b/Makefile
index 2363762..7aec207 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,25 @@
-all: spark pyspark kafka
+all: spark pyspark kafka spark-pyspark-kafka
 
-spark: spark/Dockerfile spark/start-master.sh spark/start-worker.sh
-	docker build $(BUILD_OPTS) -t nstanger/spark:latest -f $< $@
+COMBINED_FILES:=$(wildcard spark-pyspark-kafka/*)
+SPARK_FILES:=$(wildcard spark/*)
+PYSPARK_FILES:=$(wildcard pyspark/*)
+KAFKA_FILES:=$(wildcard kafka/*)
+
+spark-pyspark-kafka: $(COMBINED_FILES)
+	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
+
+spark: $(SPARK_FILES)
+	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
 
 # Rebuild both the following if spark changes!
-pyspark: pyspark/Dockerfile pyspark/kernel.json
-	docker build $(BUILD_OPTS) -t nstanger/pyspark:latest -f $< $@
+pyspark: $(PYSPARK_FILES)
+	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
 
-kafka: kafka/Dockerfile kafka/start-kafka.sh
-	docker build $(BUILD_OPTS) -t nstanger/kafka:latest -f $< $@
+kafka: $(KAFKA_FILES)
+	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
+
+debug:
+	@echo "COMBINED_FILES = [$(COMBINED_FILES)]"
+	@echo "SPARK_FILES = [$(SPARK_FILES)]"
+	@echo "PYSPARK_FILES = [$(PYSPARK_FILES)]"
+	@echo "KAFKA_FILES = [$(KAFKA_FILES)]"