diff --git a/infrastructure/terraform/modules/route53/main.tf b/infrastructure/terraform/modules/route53/main.tf
index bcbdfc77..ad3f9fd1 100644
--- a/infrastructure/terraform/modules/route53/main.tf
+++ b/infrastructure/terraform/modules/route53/main.tf
@@ -20,10 +20,15 @@ resource "aws_acm_certificate" "my_certificate_request" {
 # Create a DNS record to prove that we own the domain
 resource "aws_route53_record" "my_validation_record" {
   zone_id = aws_route53_zone.my_hosted_zone.zone_id
-  name    = aws_acm_certificate.my_certificate_request.domain_validation_options.0.resource_record_name
-  type    = aws_acm_certificate.my_certificate_request.domain_validation_options.0.resource_record_type
-  records = [aws_acm_certificate.my_certificate_request.domain_validation_options.0.resource_record_value]
-  ttl     = var.ttl
+  for_each = {
+    for dvo in aws_acm_certificate.my_certificate_request.domain_validation_options: dvo.domain_name => {
+      name   = dvo.resource_record_name
+      record = dvo.resource_record_value
+      type   = dvo.resource_record_type
+    }
+  }
+
+  ttl     = 60
 }
 
 resource "aws_acm_certificate_validation" "my_certificate_validation" {
@@ -39,5 +44,12 @@ resource "aws_route53_record" "my_caa_record" {
     "0 issue \"amazon.com\"",
     "0 issuewild \"amazon.com\""
   ]
-  ttl = var.ttl
+  ttl = 60
+}
+
+# Store the certificate in SSM so that we can access it from other resources
+resource "aws_ssm_parameter" "certificate_arn" {
+  name  = "/ssl_certificate_arn"
+  type  = "String"
+  value = aws_acm_certificate.my_certificate_request.arn
 }
\ No newline at end of file