Use envoy instead of keychain