diff --git a/main.tf b/main.tf
index bba0f67..67f353d 100644
--- a/main.tf
+++ b/main.tf
@@ -198,21 +198,31 @@ resource "aws_route53_record" "o365_domainkey_this2" {
 
   records = [var.ms_domainkey2]
 }
-resource "aws_route53_record" "atlassian_cloud_domainkey_this" {
-  count   = var.atlassian_cloud_dkim == true ? 1 : 0
+resource "aws_route53_record" "atlassian_cloud_primary_dkim" {
+  count   = var.atlassian_cloud_primary_dkim != "" ? 1 : 0
   zone_id = aws_route53_zone.this.zone_id
-  name    = "s1._domainkey.${aws_route53_zone.this.name}"
+  name    = "atlassian-${var.atlassian_cloud_primary_dkim}._domainkey.${aws_route53_zone.this.name}"
   type    = "CNAME"
   ttl     = var.ttl
 
-  records = ["s1._domainkey.atlassian.net."]
+  records = ["atlassian-${var.atlassian_cloud_primary_dkim}.dkim.atlassian.net."]
 }
-resource "aws_route53_record" "atlassian_cloud_domainkey_this2" {
-  count   = var.atlassian_cloud_dkim == true ? 1 : 0
+resource "aws_route53_record" "atlassian_cloud_fallback_dkim" {
+  count   = var.atlassian_cloud_fallback_dkim != "" ? 1 : 0
   zone_id = aws_route53_zone.this.zone_id
-  name    = "s2._domainkey.${aws_route53_zone.this.name}"
+  name    = "atlassian-${var.atlassian_cloud_fallback_dkim}._domainkey.${aws_route53_zone.this.name}"
   type    = "CNAME"
   ttl     = var.ttl
 
-  records = ["s2._domainkey.atlassian.net."]
-}
\ No newline at end of file
+  records = ["atlassian-${var.atlassian_cloud_fallback_dkim}.dkim.atlassian.net."]
+}
+
+resource "aws_route53_record" "atlassian_cloud_bounce" {
+  count   = var.atlassian_cloud_bounce == true ? 1 : 0
+  zone_id = aws_route53_zone.this.zone_id
+  name    = "atlassian-bounces.${aws_route53_zone.this.name}"
+  type    = "CNAME"
+  ttl     = var.ttl
+
+  records = ["bounces.mail-us.atlassian.net."]
+}
diff --git a/variables.tf b/variables.tf
index 4c2db3b..66e70f8 100644
--- a/variables.tf
+++ b/variables.tf
@@ -140,11 +140,21 @@ variable "stripe_bounce" {
   type        = bool
 }
 
-variable "atlassian_cloud_dkim" {
-  description = "Should we create the Atlassian Cloud DKIM cname records"
+variable "atlassian_cloud_bounce" {
+  description = "Should we create the Atlassian Cloud bounce cname record"
   default     = false
   type        = bool
 }
+variable "atlassian_cloud_primary_dkim" {
+  description = "Should we create the Atlassian Cloud DKIM primary cname record"
+  default     = ""
+  type        = string
+}
+variable "atlassian_cloud_fallback_dkim" {
+  description = "Should we create the Atlassian Cloud DKIM fallback cname record"
+  default     = ""
+  type        = string
+}
 
 variable "tags" {
   description = "Tags to apply to tag-able resources"