envoy: refactor status checking
envoy: -p won't prevent adding keys on first run