diff --git a/generator/resources/ec2_mac_test_matrix.json b/generator/resources/ec2_mac_test_matrix.json
index 11c3b8d62..b131e6553 100644
--- a/generator/resources/ec2_mac_test_matrix.json
+++ b/generator/resources/ec2_mac_test_matrix.json
@@ -34,5 +34,17 @@
         "instanceType":"mac1.metal",
         "ami": "cloudwatch-agent-integration-test-mac-monterey-x86",
         "arc": "amd64"
+      },
+      {
+        "os": "macOS Sonoma Arm64",
+        "instanceType":"mac2.metal",
+        "ami": "cloudwatch-agent-integration-test-mac-sonoma-arm64",
+        "arc": "arm64"
+      },
+      {
+        "os": "macOS Sonoma Amd64",
+        "instanceType":"mac1.metal",
+        "ami": "cloudwatch-agent-integration-test-mac-sonoma-x86",
+        "arc": "amd64"
       }
 ]
\ No newline at end of file
diff --git a/terraform/setup/main.tf b/terraform/setup/main.tf
index d8c3d6bd7..f2e02ac0e 100644
--- a/terraform/setup/main.tf
+++ b/terraform/setup/main.tf
@@ -81,9 +81,11 @@ resource "aws_ec2_host" "dedicated_host" {
   ## and upper bound for the newest version of Mac we support MacOS Ventura)
   for_each = {
     "Ventura_x86_64" : "mac1.metal"
+    "Sonoma_x86_64"  : "mac1.metal"
     "Big_Sur_x86_64" : "mac1.metal"
     "Ventura_arm64" : "mac2.metal"
     "Big_Sur_arm64" : "mac2.metal"
+    "Sonoma_arm64"  : "mac2.metal"
   }
 
   ## Map 4x1 for avoid claimng resources