diff --git a/services/terraform/self-host/aws-deploy.sh b/services/terraform/self-host/aws-deploy.sh
--- a/services/terraform/self-host/aws-deploy.sh
+++ b/services/terraform/self-host/aws-deploy.sh
@@ -16,7 +16,7 @@
 secondary_service_name="keyserver-secondary-service"
 
 # Grab user configuration variables from terraform.tfvars
-health_check_domain=$(echo "var.domain_name" | terraform console -var-file terraform.tfvars.json | tr -d '"')
+health_check_domain=$(echo "var.keyserver_domain_name" | terraform console -var-file terraform.tfvars.json | tr -d '"')
 health_check_url="https://${health_check_domain}/health"
 num_desired_secondary_nodes=$(echo "var.desired_secondary_nodes" | terraform console -var-file terraform.tfvars.json)
 
diff --git a/services/terraform/self-host/aws_lb.tf b/services/terraform/self-host/aws_lb.tf
--- a/services/terraform/self-host/aws_lb.tf
+++ b/services/terraform/self-host/aws_lb.tf
@@ -80,7 +80,7 @@
 
 
 data "aws_acm_certificate" "keyserver_service" {
-  domain   = var.domain_name
+  domain   = var.keyserver_domain_name
   statuses = ["ISSUED"]
 }
 
diff --git a/services/terraform/self-host/keyserver_secondary.tf b/services/terraform/self-host/keyserver_secondary.tf
--- a/services/terraform/self-host/keyserver_secondary.tf
+++ b/services/terraform/self-host/keyserver_secondary.tf
@@ -74,7 +74,7 @@
   provisioner "local-exec" {
     command = <<EOT
       while true; do
-      if curl --silent --output /dev/null --fail "https://${var.domain_name}/health"; then
+      if curl --silent --output /dev/null --fail "https://${var.keyserver_domain_name}/health"; then
           echo "Primary service is healthy. Proceeding with deployment of secondary service."
           exit 0
         else
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
@@ -1,8 +1,18 @@
-variable "domain_name" {
+variable "keyserver_domain_name" {
   description = "Domain name for your keyserver"
   type        = string
 }
 
+variable "landing_domain_name" {
+  description = "Domain name for your landing page"
+  type        = string
+}
+
+variable "webapp_domain_name" {
+  description = "Domain name for your web app"
+  type        = string
+}
+
 variable "region" {
   description = "The AWS region to deploy your keyserver in"
   type        = string