diff --git a/Makefile b/Makefile
index 7aec207..cbd3c18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,19 @@
-all: spark pyspark kafka spark-pyspark-kafka
+SPARK=spark
+PYSPARK=pyspark
+KAFKA=kafka
+COMBINED=spark-pyspark-kafka
 
-COMBINED_FILES:=$(wildcard spark-pyspark-kafka/*)
-SPARK_FILES:=$(wildcard spark/*)
-PYSPARK_FILES:=$(wildcard pyspark/*)
-KAFKA_FILES:=$(wildcard kafka/*)
+all: $(SPARK) $(PYSPARK) $(KAFKA) $(COMBINED)
 
-spark-pyspark-kafka: $(COMBINED_FILES)
-	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
+$(COMBINED):
+	make -C $(COMBINED) image
 
-spark: $(SPARK_FILES)
-	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
+$(SPARK):
+	make -C $(SPARK) image
 
 # Rebuild both the following if spark changes!
-pyspark: $(PYSPARK_FILES)
-	docker build $(BUILD_OPTS) -t nstanger/$@:latest -f $< $@
+$(PYSPARK):
+	make -C $(PYSPARK) image
 
-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)]"
+$(KAFKA):
+	make -C $(KAFKA) image