diff --git a/services/terraform/self-host/keyserver_primary.tf b/services/terraform/self-host/keyserver_primary.tf
--- a/services/terraform/self-host/keyserver_primary.tf
+++ b/services/terraform/self-host/keyserver_primary.tf
@@ -99,6 +99,12 @@
             "identitySocketAddr" : "${var.identity_socket_address}"
           })
         },
+        {
+          name = "COMM_JSONCONFIG_facts_authoritative_keyserver",
+          value = jsonencode({
+            "authoritativeKeyserverID" : "${var.authoritative_keyserver_id}"
+          }),
+        }
       ]
       logConfiguration = {
         "logDriver" = "awslogs"
diff --git a/services/terraform/self-host/variables.tf b/services/terraform/self-host/variables.tf
--- a/services/terraform/self-host/variables.tf
+++ b/services/terraform/self-host/variables.tf
@@ -37,6 +37,11 @@
   sensitive   = true
 }
 
+variable "authoritative_keyserver_id" {
+  description = "Authoritative Keyserver ID"
+  type        = string
+}
+
 variable "using_identity_credentials" {
   description = "Whether to use identity credentials to login"
   type        = bool