We should make this configurable via env var too