diff --git a/services/terraform/self-host/aws-deploy.sh b/services/terraform/self-host/aws-deploy.sh
index 6ae6098bb..6de59eb38 100755
--- a/services/terraform/self-host/aws-deploy.sh
+++ b/services/terraform/self-host/aws-deploy.sh
@@ -1,145 +1,145 @@
 #!/bin/bash
 
 # Disable AWS cli command pager outputs
 export AWS_PAGER=""
 
 
 # Do not change without replacing keyserver_cluster name in aws_ecs.tf
 cluster_name="keyserver-cluster"
 
 # Do not change without replacing keyserver_primary_service
 # name in keyserver_primary.tf
 primary_service_name="keyserver-primary-service"
 
 # Do not change without replacing keyserver_secondary_service
 # name in keyserver_secondary.tf
 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)
 
 if [[ -z "${AWS_ACCESS_KEY_ID}" || -z "${AWS_SECRET_ACCESS_KEY}" ]]; then
   echo "Error: AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables must be set to run migration."
   exit 1
 fi
 
 if ! aws sts get-caller-identity > /dev/null; then
   echo "Error: Invalid AWS credentials or not in nix shell. Please check your AWS configuration and/or run nix develop."
   exit 1
 fi
 
 convert_seconds() {
   total_seconds="$1"
   minutes="$((total_seconds / 60))"
   seconds="$((total_seconds % 60))"
 
   if (( minutes > 0 )); then
     echo "${minutes} minute(s) and ${seconds} seconds"
   else
     echo "${seconds} seconds"
   fi
 }
 
 check_health() {
   local retry_interval=10
   local total_elapsed_time=0
   
   while true; do
     http_code=$(curl -s -o /dev/null -w "%{http_code}" "$health_check_url")
     if [[ "$http_code" -eq 200 ]]; then
       echo "Health check returned status 200 OK $http_code. Primary keyserver node ready"
       return 0
     fi
     total_elapsed_time="$(( total_elapsed_time + retry_interval ))"
     converted_time="$(convert_seconds $total_elapsed_time)"
 
     echo "Health check returned status $http_code. Elapsed time: ${converted_time}."
     sleep $retry_interval
   done
 }
 
 disable_lb_traffic() {
   aws ec2 revoke-security-group-ingress \
       --group-id "$(aws ec2 describe-security-groups --filters "Name=group-name,Values=lb-sg" --query "SecurityGroups[0].GroupId" --output text)" \
       --protocol tcp \
       --port 443 \
       --cidr 0.0.0.0/0 > /dev/null
 }
 
 enable_lb_traffic() {
   aws ec2 authorize-security-group-ingress \
     --group-id "$(aws ec2 describe-security-groups --filters "Name=group-name,Values=lb-sg" --query "SecurityGroups[0].GroupId" --output text)" \
     --protocol tcp \
     --port 443 \
     --cidr 0.0.0.0/0 > /dev/null
 }
 
 # Stop all primary and secondary tasks and disable traffic to load balancer
 echo "Disabling traffic to load balancer"
 disable_lb_traffic
 
 http_code=$(curl -s -o /dev/null -w "%{http_code}" --max-time 5 "$health_check_url")
 if [[ "$http_code" -eq 000 ]]; then
   echo "Error: Health check timed out trying to access keyserver domain at ${health_check_url}."
   echo "Ensure terraform variable allowed_ip is properly configured and run terraform apply"
 
     echo "Re-enabling traffic to load balancer until domain is accessible and migration script is rerun"
     enable_lb_traffic
     exit 1
 fi
 
 echo "Set desired count of secondary service to 0"
 aws ecs update-service --cluster "$cluster_name" --service "$secondary_service_name" --desired-count 0 > /dev/null
 
 echo "Taking down all secondary nodes in $cluster_name"
 
 task_arns=$(aws ecs list-tasks --cluster "$cluster_name" --service-name "$secondary_service_name" --query 'taskArns[*]' --output text)
 
 for task_arn in $task_arns; do
   echo "Stopping secondary node running on task $task_arn"
   aws ecs stop-task --cluster "$cluster_name" --task "$task_arn" > /dev/null
 done
 
 echo "Set desired count of primary service to 0"
 aws ecs update-service --cluster "$cluster_name" --service "$primary_service_name" --desired-count 0 > /dev/null
 
 echo "Taking down primary node in $cluster_name"
 primary_task_arns=$(aws ecs list-tasks --cluster "$cluster_name" --service-name "$primary_service_name" --query 'taskArns[*]' --output text)
 
 for primary_task_arn in $primary_task_arns; do
   echo "Stopping primary node running on task $primary_task_arn"
   aws ecs stop-task --cluster "$cluster_name" --task "$primary_task_arn" > /dev/null
 done
 
 echo "Waiting until primary and secondary nodes have been shutdown"
 total_elapsed_time=0
 retry_interval=10
 while true; do
     http_code=$(curl -s -o /dev/null -w "%{http_code}" "$health_check_url")
 
     echo "Health check returned status $http_code. Elapsed time: $(convert_seconds $total_elapsed_time)"
 
     if [[ "$http_code" -ne 200 ]]; then
         echo "Stopping primary and secondary nodes was successful. Continuing with migration."
         break
     fi
 
     total_elapsed_time=$(( total_elapsed_time + retry_interval ))
     sleep $retry_interval
 done
 
 echo "Redeploying primary service in $cluster_name"
 aws ecs update-service --cluster "$cluster_name" --service "$primary_service_name" --force-new-deployment --desired-count 1 > /dev/null
 
 echo "Waiting for health check at $health_check_domain to return status 200 OK"
 check_health
 
 echo "Primary node successfully running. Re-enabling public access to load balancer"
 enable_lb_traffic
 
 echo "Setting desired count of secondary service to $num_desired_secondary_nodes".
 aws ecs update-service --cluster "$cluster_name" --service "$secondary_service_name" --desired-count "$num_desired_secondary_nodes" --force-new-deployment > /dev/null
 
 echo "Successfully ran migration"
diff --git a/services/terraform/self-host/aws_lb.tf b/services/terraform/self-host/aws_lb.tf
index 1e1872e98..74218ee21 100644
--- a/services/terraform/self-host/aws_lb.tf
+++ b/services/terraform/self-host/aws_lb.tf
@@ -1,89 +1,89 @@
 resource "aws_security_group" "lb_sg" {
   name        = "lb-sg"
   description = "Security group for keyserver load balancer"
   vpc_id      = local.vpc_id
 
   ingress {
     from_port   = 443
     to_port     = 443
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
   }
 
   ingress {
     from_port   = 443
     to_port     = 443
     protocol    = "tcp"
     cidr_blocks = ["${var.allowed_ip}/32"]
   }
 
   egress {
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
     cidr_blocks = ["0.0.0.0/0"]
   }
 }
 
 resource "aws_lb_target_group" "keyserver_service" {
   name     = "keyserver-service-ecs-tg"
   port     = 3000
   protocol = "HTTP"
   vpc_id   = local.vpc_id
 
   # "awsvpc" network mode requires target type set to ip
   target_type = "ip"
 
   stickiness {
     type            = "lb_cookie"
     cookie_duration = 86500
     enabled         = true
   }
 
   health_check {
     enabled             = true
     healthy_threshold   = 2
     unhealthy_threshold = 3
 
     protocol = "HTTP"
     path     = "/health"
     matcher  = "200-299"
   }
 }
 
 resource "aws_lb" "keyserver_service" {
   load_balancer_type = "application"
   name               = "keyserver-service-lb"
   security_groups    = [aws_security_group.lb_sg.id]
 
   internal = false
   subnets  = local.vpc_subnets
 }
 
 resource "aws_lb_listener" "keyserver_service" {
   load_balancer_arn = aws_lb.keyserver_service.arn
   port              = "443"
   protocol          = "HTTPS"
   ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = data.aws_acm_certificate.keyserver_service.arn
 
   default_action {
     type             = "forward"
     target_group_arn = aws_lb_target_group.keyserver_service.arn
   }
 
   lifecycle {
     ignore_changes       = [default_action[0].forward[0].stickiness[0].duration]
     replace_triggered_by = [aws_lb_target_group.keyserver_service]
   }
 }
 
 
 data "aws_acm_certificate" "keyserver_service" {
-  domain   = var.domain_name
+  domain   = var.keyserver_domain_name
   statuses = ["ISSUED"]
 }
 
 output "keyserver_service_load_balancer_dns_name" {
   value = aws_lb.keyserver_service.dns_name
 }
diff --git a/services/terraform/self-host/keyserver_secondary.tf b/services/terraform/self-host/keyserver_secondary.tf
index 536420977..c2a0c03a3 100644
--- a/services/terraform/self-host/keyserver_secondary.tf
+++ b/services/terraform/self-host/keyserver_secondary.tf
@@ -1,120 +1,120 @@
 locals {
   keyserver_secondary_container_name = "keyserver-secondary"
 
   secondary_environment_vars = merge(local.shared_environment_vars,
     {
       "COMM_NODE_ROLE"                          = "secondary",
       "COMM_JSONCONFIG_facts_run_server_config" = local.keyserver_run_server_config
   })
 
   secondary_environment = [
     for name, value in local.secondary_environment_vars : {
       name  = name
       value = value
     }
   ]
 }
 
 resource "aws_cloudwatch_log_group" "keyserver_secondary_service" {
   name              = "/ecs/keyserver-secondary-task-def"
   retention_in_days = 7
 }
 
 resource "aws_ecs_task_definition" "keyserver_secondary_service" {
   depends_on = [aws_ecs_service.keyserver_primary_service]
 
   network_mode             = "awsvpc"
   family                   = "keyserver-secondary-task-def"
   requires_compatibilities = ["FARGATE"]
   task_role_arn            = aws_iam_role.ecs_task_role.arn
   execution_role_arn       = aws_iam_role.ecs_task_execution.arn
   cpu                      = "2048"
   memory                   = "4096"
 
   ephemeral_storage {
     size_in_gib = 40
   }
 
   container_definitions = jsonencode([
     {
       name      = local.keyserver_secondary_container_name
       image     = local.keyserver_service_server_image
       essential = true
       portMappings = [
         {
           name          = "keyserver-port"
           containerPort = 3000
           hostPort      = 3000,
           protocol      = "tcp"
         },
 
       ]
       environment = local.secondary_environment
       logConfiguration = {
         "logDriver" = "awslogs"
         "options" = {
           "awslogs-create-group"  = "true"
           "awslogs-group"         = aws_cloudwatch_log_group.keyserver_secondary_service.name
           "awslogs-stream-prefix" = "ecs"
           "awslogs-region"        = "${var.region}"
         }
       }
       linuxParameters = {
         initProcessEnabled = true
       }
     }
   ])
 
   runtime_platform {
     cpu_architecture        = "ARM64"
     operating_system_family = "LINUX"
   }
 
   # Wait indefinitely for primary service to become healthy before deploying secondary service
   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
           echo "Primary service is not healthy yet. Waiting 10 seconds before checking again..."
           sleep 10
         fi
       done
     EOT
   }
 
   skip_destroy = false
 }
 
 resource "aws_ecs_service" "keyserver_secondary_service" {
   depends_on = [aws_ecs_service.keyserver_primary_service]
 
   # Do not change name without replacing secondary_service_name in aws-deploy.sh
   name                    = "keyserver-secondary-service"
   cluster                 = aws_ecs_cluster.keyserver_cluster.id
   task_definition         = aws_ecs_task_definition.keyserver_secondary_service.arn
   launch_type             = "FARGATE"
   enable_execute_command  = true
   enable_ecs_managed_tags = true
   force_new_deployment    = true
   desired_count           = var.desired_secondary_nodes
 
   network_configuration {
     subnets          = local.vpc_subnets
     security_groups  = [aws_security_group.keyserver_service.id]
     assign_public_ip = true
   }
 
   load_balancer {
     target_group_arn = aws_lb_target_group.keyserver_service.arn
     container_name   = local.keyserver_secondary_container_name
     container_port   = 3000
   }
 
   deployment_circuit_breaker {
     enable   = true
     rollback = true
   }
 }
diff --git a/services/terraform/self-host/variables.tf b/services/terraform/self-host/variables.tf
index c182e832d..2ac93901c 100644
--- a/services/terraform/self-host/variables.tf
+++ b/services/terraform/self-host/variables.tf
@@ -1,43 +1,53 @@
-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
   default     = "us-west-1"
 }
 
 variable "allowed_ip" {
   description = "IP address"
   type        = string
 }
 
 variable "user_created_vpc" {
   description = "Use non-default vpc and subnets"
 }
 
 variable "availability_zone_1" {
   description = "First availability zone for vpc subnet if user created vpc"
   type        = string
   default     = "us-west-1b"
 }
 
 variable "availability_zone_2" {
   description = "Second availability zone for vpc subnet if user created vpc"
   type        = string
   default     = "us-west-1c"
 }
 
 variable "db_instance_class" {
   description = "The instance class for the MariaDB RDS instance"
   type        = string
   default     = "db.t4g.medium"
 }
 
 variable "desired_secondary_nodes" {
   description = "Desired number of secondary nodes"
   type        = number
   default     = 1
 }