diff --git a/Makefile b/Makefile
index 86c37b223dd0294109cce05102107cae86c92005..d5c60e4c88e4994f34971e83268f233612427036 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
-all:
-	$(MAKE) -C 33
-	$(MAKE) -C 34
-	$(MAKE) -C 35
-	$(MAKE) -C 36
-
-push:
-	$(MAKE) -C 33 push
-	$(MAKE) -C 34 push
-	$(MAKE) -C 35 push
-	$(MAKE) -C 36 push
+TARGETS := $(patsubst %/Dockerfile,%,$(wildcard */Dockerfile))
+PUSH_TARGETS := $(patsubst %,%-push,$(TARGETS))
+
+.PHONY: $(TARGETS)
+
+all: $(TARGETS)
+
+$(TARGETS):
+	$(MAKE) -C $@
+
+$(PUSH_TARGETS):
+	$(MAKE) -C $@ push