diff --git a/Makefile b/Makefile
index 0c0f4dd47b03bee2e6adeb825cffcb17f362e2e3..d5c60e4c88e4994f34971e83268f233612427036 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
-all:
-	$(MAKE) -C 15.2
-	$(MAKE) -C 15.3
+TARGETS := $(patsubst %/Dockerfile,%,$(wildcard */Dockerfile))
+PUSH_TARGETS := $(patsubst %,%-push,$(TARGETS))
 
-push:
-	$(MAKE) -C 15.2 push
-	$(MAKE) -C 15.3 push
+.PHONY: $(TARGETS)
+
+all: $(TARGETS)
+
+$(TARGETS):
+	$(MAKE) -C $@
+
+$(PUSH_TARGETS):
+	$(MAKE) -C $@ push