diff --git a/tools/cfn-templates/fwdemo.yml b/tools/cfn-templates/fwdemo.yml
index ec4a3f7..f074319 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-0fb95e7bb4ab88d73
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-05904600e594addce
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-07efed9d2fa853e2e
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-00adf533fd135ce62
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-08236e16f8ee14acf
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0a3ff59a725373043
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0c88fe157af6decde
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-09f4c409d55852e90
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-09dfffbbe2f9875ef
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0fd301a23be2fbe30
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-00eba26d2b9b1cb52
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-07ca702a56e7d61d0
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-02a5478d1b0d6d00d
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-04abdba8d57480cde
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-0a5ee0f0c6f60deaa
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-02b16b76c2ed386c5
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-039aad0ef6d1c0b87
   FleetSizeEc2InstanceTypeMap:
     "1":
       InstanceType: m6g.xlarge
diff --git a/tools/cfn-templates/fwdev.yml b/tools/cfn-templates/fwdev.yml
index c54cdc0..d761763 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-0fb95e7bb4ab88d73
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-05904600e594addce
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-07efed9d2fa853e2e
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-00adf533fd135ce62
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-08236e16f8ee14acf
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0a3ff59a725373043
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0c88fe157af6decde
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-09f4c409d55852e90
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-09dfffbbe2f9875ef
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0fd301a23be2fbe30
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-00eba26d2b9b1cb52
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-07ca702a56e7d61d0
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-02a5478d1b0d6d00d
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-04abdba8d57480cde
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-0a5ee0f0c6f60deaa
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-02b16b76c2ed386c5
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-039aad0ef6d1c0b87
   # Ubuntu 22.04 amd64 AMIs
   AMIRegionMapAmd64:
     ap-northeast-1:
-      AMIID: ami-01ff1fcabf5f7572c
+      AMIID: ami-0b9e0a44d51709144
     ap-northeast-2:
-      AMIID: ami-00bbf0eabfaee75db
+      AMIID: ami-0bff16fba1614f8ad
     ap-northeast-3:
-      AMIID: ami-0ceb700c7ed339b2c
+      AMIID: ami-0ee210e08458a48ff
     ap-south-1:
-      AMIID: ami-0add08d545f97eb70
+      AMIID: ami-0f115dbaf1a9a8222
     ap-southeast-1:
-      AMIID: ami-08d17f4183e481a35
+      AMIID: ami-04c4b91fde394e924
     ap-southeast-2:
-      AMIID: ami-0e7a5785ab62399cb
+      AMIID: ami-0adb39ef0166340af
     ca-central-1:
-      AMIID: ami-082699d130dfb7a48
+      AMIID: ami-0668b233d7827bbf8
     eu-central-1:
-      AMIID: ami-0857b63eb9da0783d
+      AMIID: ami-0e2108df824ee2a7b
     eu-north-1:
-      AMIID: ami-02fda57d7882770d8
+      AMIID: ami-0c395e1ea315b0088
     eu-west-1:
-      AMIID: ami-0a7e505f26c66ccb1
+      AMIID: ami-0b126f69ececf3c3d
     eu-west-2:
-      AMIID: ami-0c36b0523e1392e84
+      AMIID: ami-0d5f5a786b321c320
     eu-west-3:
-      AMIID: ami-0fc9df40a6c4cc53c
+      AMIID: ami-0b7068d8f2542ff6a
     sa-east-1:
-      AMIID: ami-0b99c1693a3a65584
+      AMIID: ami-0090f4c9d95a70cd9
     us-east-1:
-      AMIID: ami-021589336d307b577
+      AMIID: ami-0a03ce9a6035af491
     us-east-2:
-      AMIID: ami-08a98e6d1b5aa6099
+      AMIID: ami-034bcb306215cad52
     us-west-1:
-      AMIID: ami-0742eb7300e2d407c
+      AMIID: ami-0cd000a60536dcba5
     us-west-2:
-      AMIID: ami-0ac098a0168eb72d0
+      AMIID: ami-005f7acd8475ac91c
 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..c9a40af 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-0fb95e7bb4ab88d73
     ap-northeast-2:
-      AMIID: ami-0ee413af3d419b913
+      AMIID: ami-05904600e594addce
     ap-northeast-3:
-      AMIID: ami-0707b5724f3d370a1
+      AMIID: ami-07efed9d2fa853e2e
     ap-south-1:
-      AMIID: ami-0041facac80f93bbe
+      AMIID: ami-00adf533fd135ce62
     ap-southeast-1:
-      AMIID: ami-084594bed915f5e8f
+      AMIID: ami-08236e16f8ee14acf
     ap-southeast-2:
-      AMIID: ami-07bf7b6acb5db5e13
+      AMIID: ami-0a3ff59a725373043
     ca-central-1:
-      AMIID: ami-0d1bde699564f5a7a
+      AMIID: ami-0c88fe157af6decde
     eu-central-1:
-      AMIID: ami-0bc586dd8476ba5b1
+      AMIID: ami-09f4c409d55852e90
     eu-north-1:
-      AMIID: ami-008e58f8f6505bf76
+      AMIID: ami-09dfffbbe2f9875ef
     eu-west-1:
-      AMIID: ami-04434961757c31b63
+      AMIID: ami-0fd301a23be2fbe30
     eu-west-2:
-      AMIID: ami-02c510094a29f0052
+      AMIID: ami-00eba26d2b9b1cb52
     eu-west-3:
-      AMIID: ami-0bbeecfe5196eab29
+      AMIID: ami-07ca702a56e7d61d0
     sa-east-1:
-      AMIID: ami-080924daa71cbdad8
+      AMIID: ami-02a5478d1b0d6d00d
     us-east-1:
-      AMIID: ami-06daf9c2d2cf1cb37
+      AMIID: ami-04abdba8d57480cde
     us-east-2:
-      AMIID: ami-0edd45507c30e47d4
+      AMIID: ami-0a5ee0f0c6f60deaa
     us-west-1:
-      AMIID: ami-01557579a54cccc40
+      AMIID: ami-02b16b76c2ed386c5
     us-west-2:
-      AMIID: ami-057a2512faa740640
+      AMIID: ami-039aad0ef6d1c0b87