diff --git a/services/identity/src/config.rs b/services/identity/src/config.rs
--- a/services/identity/src/config.rs
+++ b/services/identity/src/config.rs
@@ -4,8 +4,8 @@
 use std::{collections::HashSet, env, fmt, fs, io, path};
 
 use crate::constants::{
-  AUTH_TOKEN, LOCALSTACK_ENDPOINT, SECRETS_DIRECTORY, SECRETS_FILE_EXTENSION,
-  SECRETS_FILE_NAME, SECRETS_SETUP_FILE,
+  AUTH_TOKEN, KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT, SECRETS_DIRECTORY,
+  SECRETS_FILE_EXTENSION, SECRETS_FILE_NAME, SECRETS_SETUP_FILE,
 };
 
 pub static CONFIG: Lazy<Config> =
@@ -26,6 +26,7 @@
   pub server_setup: comm_opaque2::ServerSetup<comm_opaque2::Cipher>,
   // Reserved usernames
   pub reserved_usernames: HashSet<String>,
+  pub keyserver_public_key: Option<String>,
 }
 
 impl Config {
@@ -46,12 +47,15 @@
 
     let reserved_usernames = get_reserved_usernames_set()?;
 
+    let keyserver_public_key = env::var(KEYSERVER_PUBLIC_KEY).ok();
+
     Ok(Self {
       server_keypair,
       keyserver_auth_token,
       localstack_endpoint,
       server_setup,
       reserved_usernames,
+      keyserver_public_key,
     })
   }
 }
diff --git a/services/identity/src/constants.rs b/services/identity/src/constants.rs
--- a/services/identity/src/constants.rs
+++ b/services/identity/src/constants.rs
@@ -99,6 +99,7 @@
 // Temporary config
 
 pub const AUTH_TOKEN: &str = "COMM_IDENTITY_SERVICE_AUTH_TOKEN";
+pub const KEYSERVER_PUBLIC_KEY: &str = "KEYSERVER_PUBLIC_KEY";
 
 // Nonce