diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf
index 89d3572e..cdbf2b84 100644
--- a/operations/deployment/terraform/aws/bitovi_main.tf
+++ b/operations/deployment/terraform/aws/bitovi_main.tf
@@ -820,13 +820,18 @@ locals {
   alb_url              = try(module.aws_lb[0].aws_alb_dns_name, null) != null ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null
 
   vm_url_candidates = [
-    try(module.aws_route53[0].vm_url, null),
-    local.alb_url,
-    local.elb_url,
-    local.ec2_endpoint
+    try(try(module.aws_route53[0].vm_url, null),
+      local.alb_url,
+      local.elb_url,
+    local.ec2_endpoint, null)
   ]
-  vm_url_first_nonempty = [for url in local.vm_url_candidates : url if url != null && url != ""][0]
+  vm_url_first_nonempty = (
+    length([for url in local.vm_url_candidates : url if url != null && url != ""]) > 0
+    ? [for url in local.vm_url_candidates : url if url != null && url != ""][0]
+    : null
+  )
 }
+
 # VPC
 output "aws_vpc_id" {
   value = module.vpc.aws_selected_vpc_id
@@ -883,7 +888,8 @@ output "application_public_dns" {
 }
 
 output "vm_url" {
-  value = local.vm_url_first_nonempty
+  description = "Will print the best available URL for the VM, ALB, ELB or EC2 instance"
+  value       = try(local.vm_url_first_nonempty, null)
 }
 
 # EFS
diff --git a/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf b/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf
index 86d51aa8..fc6792e6 100644
--- a/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf
+++ b/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf
@@ -10,7 +10,7 @@ data "aws_acm_certificate" "issued" {
     "wildcard" = "*.${var.aws_r53_domain_name}",
     "sub"      = "${var.aws_r53_sub_domain_name}.${var.aws_r53_domain_name}"
   } : {}
-  domain = each.value
+  domain = var.aws_r53_domain_name
 }
 
 # This block will create and validate the root domain and www cert