diff --git a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template
index 09f6465..11167c2 100644
--- a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template
+++ b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template
@@ -91,7 +91,7 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.2.4",
+            "Default": "7.6.2",
             "AllowedValues": [
                 "7.1.0",
                 "7.1.1",
@@ -101,7 +101,11 @@
                 "7.2.0",
                 "7.2.2",
                 "7.2.3",
-                "7.2.4"
+                "7.2.4",
+                "7.2.5",
+                "7.6.0",
+                "7.6.1",
+                "7.6.2"
             ]
         },
         "CoreInstanceType": {
@@ -135,6 +139,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -179,6 +199,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -278,6 +314,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -322,6 +374,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -387,6 +455,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -431,6 +515,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -496,6 +596,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -540,6 +656,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -605,6 +737,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -649,6 +797,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -714,6 +878,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -758,6 +938,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -823,6 +1019,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -867,6 +1079,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
@@ -932,6 +1160,22 @@
                 "r6gd.12xlarge",
                 "r6gd.16xlarge",
                 "r6gd.metal",
+                "r7g.large",
+                "r7g.xlarge",
+                "r7g.2xlarge",
+                "r7g.4xlarge",
+                "r7g.8xlarge",
+                "r7g.12xlarge",
+                "r7g.16xlarge",
+                "r7g.metal",
+                "r7gd.large",
+                "r7gd.xlarge",
+                "r7gd.2xlarge",
+                "r7gd.4xlarge",
+                "r7gd.8xlarge",
+                "r7gd.12xlarge",
+                "r7gd.16xlarge",
+                "r7gd.metal",
                 "t4g.nano",
                 "t4g.micro",
                 "t4g.small",
@@ -976,6 +1220,22 @@
                 "c6gn.8xlarge",
                 "c6gn.12xlarge",
                 "c6gn.16xlarge",
+                "c7g.large",
+                "c7g.xlarge",
+                "c7g.2xlarge",
+                "c7g.4xlarge",
+                "c7g.8xlarge",
+                "c7g.12xlarge",
+                "c7g.16xlarge",
+                "c7g.metal",
+                "c7gd.large",
+                "c7gd.xlarge",
+                "c7gd.2xlarge",
+                "c7gd.4xlarge",
+                "c7gd.8xlarge",
+                "c7gd.12xlarge",
+                "c7gd.16xlarge",
+                "c7gd.metal",
                 "g5g.xlarge",
                 "g5g.2xlarge",
                 "g5g.4xlarge",
diff --git a/aws/CouchbaseServer-Graviton/mappings.json b/aws/CouchbaseServer-Graviton/mappings.json
index 186ead5..94b5838 100644
--- a/aws/CouchbaseServer-Graviton/mappings.json
+++ b/aws/CouchbaseServer-Graviton/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-05756cdbb2a26224e"
+            "AMI": "ami-0e4ce205994303938"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0c1fdf41518851181"
+            "AMI": "ami-0203fadde5e0025b9"
         },
         "ap-south-1": {
-            "AMI": "ami-06dab93794325d825"
+            "AMI": "ami-0a14a48599c3a37b6"
         },
         "ap-southeast-1": {
-            "AMI": "ami-06ffb5a0ae56b4141"
+            "AMI": "ami-077d9f90dd629cdea"
         },
         "ap-southeast-2": {
-            "AMI": "ami-097c0a76956a6e157"
+            "AMI": "ami-09f084139d3bbb8ff"
         },
         "ca-central-1": {
-            "AMI": "ami-011c6b7ddda57c474"
+            "AMI": "ami-0578d1ba4ec86f922"
         },
         "eu-central-1": {
-            "AMI": "ami-0828f2f3c63f56ebe"
+            "AMI": "ami-02200fd62c698c4f0"
         },
         "eu-west-1": {
-            "AMI": "ami-07726458c0e4df5a7"
+            "AMI": "ami-05bfe3f1910432a5f"
         },
         "eu-west-2": {
-            "AMI": "ami-0cc8f535aca5bd6ef"
+            "AMI": "ami-024d543e8c29456bf"
         },
         "eu-west-3": {
-            "AMI": "ami-02a649b2f07d7efd1"
+            "AMI": "ami-0d68fa15aef2dc0c7"
         },
         "sa-east-1": {
-            "AMI": "ami-0574d40b31250b8c8"
+            "AMI": "ami-0dc9842ee39b254e4"
         },
         "us-east-1": {
-            "AMI": "ami-093d74c4959b45e91"
+            "AMI": "ami-0261d2d79179fba1a"
         },
         "us-east-2": {
-            "AMI": "ami-0bd687c862e9f9593"
+            "AMI": "ami-0794bd7d46b096f20"
         },
         "us-west-1": {
-            "AMI": "ami-04dfbae3ffecd56aa"
+            "AMI": "ami-0f5a071079d0f3da2"
         },
         "us-west-2": {
-            "AMI": "ami-03141dbff931ab0c1"
+            "AMI": "ami-0c65fc214e53b3569"
         }
     }
 }
diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template
index ee5f166..8f35002 100644
--- a/aws/CouchbaseServer/couchbase-amzn-lnx2.template
+++ b/aws/CouchbaseServer/couchbase-amzn-lnx2.template
@@ -122,7 +122,10 @@
                 "7.2.2",
                 "7.2.3",
                 "7.2.4",
-                "7.6.0"
+                "7.2.5",
+                "7.6.0",
+                "7.6.1",
+                "7.6.2"
             ]
         },
         "CoreInstanceType": {
diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json
index 37286d8..2f3d571 100644
--- a/aws/CouchbaseServer/mappings.json
+++ b/aws/CouchbaseServer/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-0cc17d10d2b14ae7e"
+            "AMI": "ami-0a92322f13d1f14dc"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0aa46773288e74d66"
+            "AMI": "ami-0114763298180e7cc"
         },
         "ap-south-1": {
-            "AMI": "ami-08190105e514941ac"
+            "AMI": "ami-041602e7c2e0e09ab"
         },
         "ap-southeast-1": {
-            "AMI": "ami-022f147fcda499501"
+            "AMI": "ami-0e5e1ccdde95d5b1d"
         },
         "ap-southeast-2": {
-            "AMI": "ami-0146d0ef781e99845"
+            "AMI": "ami-032236b0ff86acfa5"
         },
         "ca-central-1": {
-            "AMI": "ami-0475939887a31e4ee"
+            "AMI": "ami-08f591a530c8e9d63"
         },
         "eu-central-1": {
-            "AMI": "ami-0cf4e6377ad164de5"
+            "AMI": "ami-0be2de2c57076cb59"
         },
         "eu-west-1": {
-            "AMI": "ami-01fadffb1ee45429b"
+            "AMI": "ami-09e1bbfd192c8d6e4"
         },
         "eu-west-2": {
-            "AMI": "ami-0d69fa456089fc677"
+            "AMI": "ami-05b74ad8be104f788"
         },
         "eu-west-3": {
-            "AMI": "ami-0c43ac7f6546fa97d"
+            "AMI": "ami-01a91ce750365c323"
         },
         "sa-east-1": {
-            "AMI": "ami-0c194b4d817eade7a"
+            "AMI": "ami-0d6ac9c63c9715b6c"
         },
         "us-east-1": {
-            "AMI": "ami-0afb013e297940095"
+            "AMI": "ami-09a22a1cd1d9d46ce"
         },
         "us-east-2": {
-            "AMI": "ami-0936a9ca51470a14e"
+            "AMI": "ami-06aafad0de559293c"
         },
         "us-west-1": {
-            "AMI": "ami-0975a9763d26eea94"
+            "AMI": "ami-0dccfdb75daec4c66"
         },
         "us-west-2": {
-            "AMI": "ami-04e56e2a935ebd3ca"
+            "AMI": "ami-03ba676b8ce3aa86e"
         }
     }
 }