diff --git a/services/identity/src/client_service.rs b/services/identity/src/client_service.rs
--- a/services/identity/src/client_service.rs
+++ b/services/identity/src/client_service.rs
@@ -7,10 +7,10 @@
 use crate::{
   client_service::client_proto::{
     DeleteUserRequest, Empty, GenerateNonceResponse, InboundKeysForUserRequest,
-    InboundKeysForUserResponse, KeyserverKeysRequest, KeyserverKeysResponse,
-    OpaqueLoginFinishRequest, OpaqueLoginFinishResponse,
-    OpaqueLoginStartRequest, OpaqueLoginStartResponse,
-    OutboundKeysForUserRequest, OutboundKeysForUserResponse,
+    InboundKeysForUserResponse, OpaqueLoginFinishRequest,
+    OpaqueLoginFinishResponse, OpaqueLoginStartRequest,
+    OpaqueLoginStartResponse, OutboundKeysForUserRequest,
+    OutboundKeysForUserResponse, OutboundKeyserverResponse,
     RefreshUserPreKeysRequest, RegistrationFinishRequest,
     RegistrationFinishResponse, RegistrationStartRequest,
     RegistrationStartResponse, UpdateUserPasswordFinishRequest,
@@ -611,8 +611,8 @@
 
   async fn get_keyserver_keys(
     &self,
-    _request: tonic::Request<KeyserverKeysRequest>,
-  ) -> Result<tonic::Response<KeyserverKeysResponse>, tonic::Status> {
+    _request: tonic::Request<OutboundKeysForUserRequest>,
+  ) -> Result<tonic::Response<OutboundKeyserverResponse>, tonic::Status> {
     unimplemented!();
   }
 
diff --git a/shared/protos/identity_client.proto b/shared/protos/identity_client.proto
--- a/shared/protos/identity_client.proto
+++ b/shared/protos/identity_client.proto
@@ -50,9 +50,9 @@
   rpc GetInboundKeysForUser(InboundKeysForUserRequest) returns
     (InboundKeysForUserResponse) {}
   // Called by clients to get required keys for opening a connection
-  // to a keyserver
-  rpc GetKeyserverKeys(KeyserverKeysRequest) returns
-    (KeyserverKeysResponse) {}
+  // to a user's keyserver
+  rpc GetKeyserverKeys(OutboundKeysForUserRequest) returns
+    (OutboundKeyserverResponse) {}
   // Replenish one-time preKeys
   rpc UploadOneTimeKeys(UploadOneTimeKeysRequest) returns (Empty) {}
   // Rotate a devices preKey and preKey signature
@@ -279,24 +279,10 @@
 
 // GetKeyserverKeys
 
-// Information needed when establishing communication to a keyserver
-message KeyserverSessionInfo {
-  IdentityKeyInfo identityInfo = 1;
-  PreKey contentPrekeys = 2;
-  optional string onetimeContentPrekey = 3;
-}
-
-// All keyserver must be registered with an existing user.
-// Conversely, one or zero keyservers can registered to a user.
-message KeyserverKeysRequest {
-  oneof identifier {
-    string username = 1;
-    string walletAddress = 2;
-  }
-}
-
-message KeyserverKeysResponse {
-  KeyserverSessionInfo keyserverInfo = 1;
+// If a user owns a keyserver, return the information needed to initiate a
+// connection.
+message OutboundKeyserverResponse {
+  optional OutboundKeyInfo keyserverInfo = 1;
 }
 
 // UploadOneTimeKeys