diff --git a/tools/cfn-templates/fwdemo.yml b/tools/cfn-templates/fwdemo.yml
index ec4a3f7..fb08323 100644
--- a/tools/cfn-templates/fwdemo.yml
+++ b/tools/cfn-templates/fwdemo.yml
@@ -625,39 +625,39 @@ Mappings:
   # Ubuntu 22.04 arm64 AMIs
   AMIRegionMap:
     ap-northeast-1:
-      AMIID: ami-02b8b87a5bfed4c7a
+      AMIID: ami-0eecf0ae30ebe8971
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-00161397e8c1366ed
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-0d96f811426a109ed
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-02d6cc4adb634ec48
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-03a782c7db103396e
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0d3e823db8117a4e4
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0b6b047ddfa5034c6
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-0d2c380199f9897f1
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-0269e551f9c122e04
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0e92357cce1e2ffe9
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-0f6de819883f93aae
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-0bce962c14c1cf0d7
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-0a5b3df1cd80ab831
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-0f14ad9f1d341c53d
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-03aca42c694a2293d
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-0096fef7fb4c75988
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-076d07f6d57a7facd
   FleetSizeEc2InstanceTypeMap:
     "1":
       InstanceType: m6g.xlarge
diff --git a/tools/cfn-templates/fwdev.yml b/tools/cfn-templates/fwdev.yml
index c54cdc0..65d54f9 100644
--- a/tools/cfn-templates/fwdev.yml
+++ b/tools/cfn-templates/fwdev.yml
@@ -235,75 +235,75 @@ Mappings:
   # Ubuntu 22.04 arm64 AMIs
   AMIRegionMapArm64:
     ap-northeast-1:
-      AMIID: ami-02b8b87a5bfed4c7a
+      AMIID: ami-0eecf0ae30ebe8971
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-00161397e8c1366ed
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-0d96f811426a109ed
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-02d6cc4adb634ec48
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-03a782c7db103396e
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0d3e823db8117a4e4
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0b6b047ddfa5034c6
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-0d2c380199f9897f1
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-0269e551f9c122e04
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0e92357cce1e2ffe9
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-0f6de819883f93aae
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-0bce962c14c1cf0d7
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-0a5b3df1cd80ab831
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-0f14ad9f1d341c53d
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-03aca42c694a2293d
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-0096fef7fb4c75988
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-076d07f6d57a7facd
   # Ubuntu 22.04 amd64 AMIs
   AMIRegionMapAmd64:
     ap-northeast-1:
-      AMIID: ami-01ff1fcabf5f7572c
+      AMIID: ami-0244ef75e95122fd9
     ap-northeast-2:
-      AMIID: ami-00bbf0eabfaee75db
+      AMIID: ami-010be25c3775061c9
     ap-northeast-3:
-      AMIID: ami-0ceb700c7ed339b2c
+      AMIID: ami-043df19be943e03b6
     ap-south-1:
-      AMIID: ami-0add08d545f97eb70
+      AMIID: ami-087d1c9a513324697
     ap-southeast-1:
-      AMIID: ami-08d17f4183e481a35
+      AMIID: ami-0827b3068f1548bf6
     ap-southeast-2:
-      AMIID: ami-0e7a5785ab62399cb
+      AMIID: ami-0eeab253db7e765a9
     ca-central-1:
-      AMIID: ami-082699d130dfb7a48
+      AMIID: ami-0c0c758c9da69d9bb
     eu-central-1:
-      AMIID: ami-0857b63eb9da0783d
+      AMIID: ami-0a854fe96e0b45e4e
     eu-north-1:
-      AMIID: ami-02fda57d7882770d8
+      AMIID: ami-01fd6fa49060e89a6
     eu-west-1:
-      AMIID: ami-0a7e505f26c66ccb1
+      AMIID: ami-0ef0fafba270833fc
     eu-west-2:
-      AMIID: ami-0c36b0523e1392e84
+      AMIID: ami-0850ab57897dcaa32
     eu-west-3:
-      AMIID: ami-0fc9df40a6c4cc53c
+      AMIID: ami-02cbf157cb22bb5b9
     sa-east-1:
-      AMIID: ami-0b99c1693a3a65584
+      AMIID: ami-0bde73fd629657a59
     us-east-1:
-      AMIID: ami-021589336d307b577
+      AMIID: ami-0c398cb65a93047f2
     us-east-2:
-      AMIID: ami-08a98e6d1b5aa6099
+      AMIID: ami-0c5ddb3560e768732
     us-west-1:
-      AMIID: ami-0742eb7300e2d407c
+      AMIID: ami-04f34746e5e1ec0fe
     us-west-2:
-      AMIID: ami-0ac098a0168eb72d0
+      AMIID: ami-03c1f788292172a4e
 Outputs:
   Ec2InstanceId:
     Description: "EC2 instance ID"
diff --git a/tools/cfn-templates/vision-system-data-jupyter.yml b/tools/cfn-templates/vision-system-data-jupyter.yml
index 9e0b990..fc9f003 100644
--- a/tools/cfn-templates/vision-system-data-jupyter.yml
+++ b/tools/cfn-templates/vision-system-data-jupyter.yml
@@ -456,36 +456,36 @@ Mappings:
   # Ubuntu 22.04 arm64 AMIs
   AMIRegionMap:
     ap-northeast-1:
-      AMIID: ami-02b8b87a5bfed4c7a
+      AMIID: ami-0eecf0ae30ebe8971
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-00161397e8c1366ed
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-0d96f811426a109ed
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-02d6cc4adb634ec48
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-03a782c7db103396e
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0d3e823db8117a4e4
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0b6b047ddfa5034c6
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-0d2c380199f9897f1
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-0269e551f9c122e04
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0e92357cce1e2ffe9
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-0f6de819883f93aae
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-0bce962c14c1cf0d7
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-0a5b3df1cd80ab831
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-0f14ad9f1d341c53d
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-03aca42c694a2293d
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-0096fef7fb4c75988
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-076d07f6d57a7facd