diff --git a/Makefile b/Makefile
index 82a99b49..b65bd9ed 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,9 @@ gorums_go := internal/proto/clientpb/client_gorums.pb.go \
 
 binaries := hotstuff plot
 
-.PHONY: all latencies debug clean protos download tools $(binaries)
+CSV ?= wonderproxy.csv
+
+.PHONY: all aws wonderproxy latencies debug clean protos download tools $(binaries)
 
 all: $(binaries)
 
@@ -39,7 +41,14 @@ clean:
 	@rm -fv $(binaries)
 
 latencies:
-	@go run cmd/latencygen/main.go -file wonderproxy.csv
+	@echo "Generating Latency Matrix using $(CSV)"
+	@go run cmd/latencygen/main.go -file "$(CSV)"
+
+wonderproxy:
+	@$(MAKE) latencies CSV=wonderproxy.csv
+
+aws:
+	@$(MAKE) latencies CSV=aws.csv
 
 %.pb.go %_gorums.pb.go : %.proto
 	protoc -I=.:$(proto_include) \