diff --git a/README.md b/README.md
index 50186f86d99d5107be190a6993c63cdd6301450b..1068108860ea7ebba2f2c84a236935e722b536f6 100644
--- a/README.md
+++ b/README.md
@@ -149,8 +149,8 @@ Secure Agent containers are deployed in following tiers in interop/AWS account.
 
 | environment| tier        |runtime name(default) in IICS |
 | -----------|-------------|-------------------------|
-| test      | us-east-1(N. Virginia)|test.ei.secureagent.doit.wisc.edu |
-| prod      | us-east-2(Ohio)|prod.ei.secureagent.doit.wisc.edu|
+| test      | us-east-1(N. Virginia)|ei.secureagent.doit.wisc.edu |
+| prod      | us-east-2(Ohio)|ei.secureagent.doit.wisc.edu|
 
 ### Architecture Diagram
 [diagram]: #architecture-diagram
@@ -219,7 +219,6 @@ vpc_tags={"Name":"prod-tier","tier":"prod"}
 private_subnets_filter={"Name":"prod-private-*"}
 security_group={"Name":"internal","tier":"prod"}
 container_name="iics-secure-agent-prod"
-container_hostname="prod.ei.secureagent.doit.wisc.edu"
 ecs_iam_role="iics-secure-agent-iam-role-prod"
 ecs_execution_role="iics-secure-agent-ecs-execution-role-prod"
 ecs_cluster_tags={"Name":"iics-agent-cluster","tier":"prod"}
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 5e88ecfac37c49521c4d92923a5e9aba7079a93a..93b235208920f8ff6b467dd670594eaaa8364a93 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -54,7 +54,7 @@ variable "container_network_mode" {
 }
 
 variable "container_hostname" {
-  default = "test.ei.secureagent.doit.wisc.edu"
+  default = "ei.secureagent.doit.wisc.edu"
 }
 
 variable "container_memory" {
diff --git a/userguide.md b/userguide.md
index 12c6eaacc9c86b9407e54f43f23eae6ddcd3faf0..8bc4d8cc10c67b90ec4edfb6021bc86fd21c4af4 100644
--- a/userguide.md
+++ b/userguide.md
@@ -16,8 +16,8 @@ following IP addresses.
 
 | environment| IP address |runtime name in IICS |
 | -----------|-------------|-------------------------|
-| test      | 3.230.240.5|test.ei.secureagent.doit.wisc.edu |
-| prod      | 3.19.12.147|prod.ei.secureagent.doit.wisc.edu|
+| test      | 3.230.240.5|ei.secureagent.doit.wisc.edu |
+| prod      | 3.19.12.147|ei.secureagent.doit.wisc.edu|
 
 ## Where To Get Support ?
 [support]: #where-to-get-support-