diff --git a/tools/cfn-templates/fwdemo.yml b/tools/cfn-templates/fwdemo.yml
index 9b06c7b..4296338 100644
--- a/tools/cfn-templates/fwdemo.yml
+++ b/tools/cfn-templates/fwdemo.yml
@@ -466,39 +466,39 @@ Mappings:
   # Ubuntu 20.04 arm64 AMIs
   AMIRegionMap:
     ap-northeast-1:
-      AMIID: ami-0eb3d9a32e9a2837e
+      AMIID: ami-05e9e343daf9e1cc5
     ap-northeast-2:
-      AMIID: ami-0d6dd5ea4cd9f9cd8
+      AMIID: ami-029e00432bb50ad7e
     ap-northeast-3:
-      AMIID: ami-011be5375f1591d2b
+      AMIID: ami-01da860e8421cc170
     ap-south-1:
-      AMIID: ami-0f9d8284ff070f71e
+      AMIID: ami-095f30df1878e4700
     ap-southeast-1:
-      AMIID: ami-026877fc4bad661d3
+      AMIID: ami-0f93cf7eb32b05cb2
     ap-southeast-2:
-      AMIID: ami-03f398a0640885fbe
+      AMIID: ami-03675bce8c9569883
     ca-central-1:
-      AMIID: ami-05f021427177342a7
+      AMIID: ami-01a3688aeac308429
     eu-central-1:
-      AMIID: ami-0bd3e1f66443d54e2
+      AMIID: ami-066dab984ffb873c6
     eu-north-1:
-      AMIID: ami-0eb751b49dfc2e213
+      AMIID: ami-0a0e7ad1236b611cd
     eu-west-1:
-      AMIID: ami-0c69f641e79ac8805
+      AMIID: ami-0632ba69de7366e89
     eu-west-2:
-      AMIID: ami-0f637511a221362ce
+      AMIID: ami-01f6b1fd35bad59e0
     eu-west-3:
-      AMIID: ami-0a6745c3030cea715
+      AMIID: ami-0b549ff7b661dfed4
     sa-east-1:
-      AMIID: ami-07ec8222251bdac42
+      AMIID: ami-071a0a0b9d5b0eb9f
     us-east-1:
-      AMIID: ami-0d5c15482d8d244d3
+      AMIID: ami-08cbf15038e1cb36a
     us-east-2:
-      AMIID: ami-06925e02bf2075947
+      AMIID: ami-0ef76ac60301b9f05
     us-west-1:
-      AMIID: ami-00455a0097fe944b4
+      AMIID: ami-0eb67a0dc573aaae1
     us-west-2:
-      AMIID: ami-01ac8d995f1367f47
+      AMIID: ami-0526d8a2a0ab17451
   FleetSizeEc2InstanceTypeMap:
     "1":
       InstanceType: m6g.xlarge
diff --git a/tools/cfn-templates/fwdev.yml b/tools/cfn-templates/fwdev.yml
index afb8457..d6d4eba 100644
--- a/tools/cfn-templates/fwdev.yml
+++ b/tools/cfn-templates/fwdev.yml
@@ -225,75 +225,75 @@ Mappings:
   # Ubuntu 20.04 arm64 AMIs
   AMIRegionMapArm64:
     ap-northeast-1:
-      AMIID: ami-0eb3d9a32e9a2837e
+      AMIID: ami-05e9e343daf9e1cc5
     ap-northeast-2:
-      AMIID: ami-0d6dd5ea4cd9f9cd8
+      AMIID: ami-029e00432bb50ad7e
     ap-northeast-3:
-      AMIID: ami-011be5375f1591d2b
+      AMIID: ami-01da860e8421cc170
     ap-south-1:
-      AMIID: ami-0f9d8284ff070f71e
+      AMIID: ami-095f30df1878e4700
     ap-southeast-1:
-      AMIID: ami-026877fc4bad661d3
+      AMIID: ami-0f93cf7eb32b05cb2
     ap-southeast-2:
-      AMIID: ami-03f398a0640885fbe
+      AMIID: ami-03675bce8c9569883
     ca-central-1:
-      AMIID: ami-05f021427177342a7
+      AMIID: ami-01a3688aeac308429
     eu-central-1:
-      AMIID: ami-0bd3e1f66443d54e2
+      AMIID: ami-066dab984ffb873c6
     eu-north-1:
-      AMIID: ami-0eb751b49dfc2e213
+      AMIID: ami-0a0e7ad1236b611cd
     eu-west-1:
-      AMIID: ami-0c69f641e79ac8805
+      AMIID: ami-0632ba69de7366e89
     eu-west-2:
-      AMIID: ami-0f637511a221362ce
+      AMIID: ami-01f6b1fd35bad59e0
     eu-west-3:
-      AMIID: ami-0a6745c3030cea715
+      AMIID: ami-0b549ff7b661dfed4
     sa-east-1:
-      AMIID: ami-07ec8222251bdac42
+      AMIID: ami-071a0a0b9d5b0eb9f
     us-east-1:
-      AMIID: ami-0d5c15482d8d244d3
+      AMIID: ami-08cbf15038e1cb36a
     us-east-2:
-      AMIID: ami-06925e02bf2075947
+      AMIID: ami-0ef76ac60301b9f05
     us-west-1:
-      AMIID: ami-00455a0097fe944b4
+      AMIID: ami-0eb67a0dc573aaae1
     us-west-2:
-      AMIID: ami-01ac8d995f1367f47
+      AMIID: ami-0526d8a2a0ab17451
   # Ubuntu 20.04 amd64 AMIs
   AMIRegionMapAmd64:
     ap-northeast-1:
-      AMIID: ami-02393cf10f95cd34f
+      AMIID: ami-0e845f4bd01a19989
     ap-northeast-2:
-      AMIID: ami-022ae9e4796cbb6e2
+      AMIID: ami-0b0dd1c713d9f4ea3
     ap-northeast-3:
-      AMIID: ami-009085e1fc4d58f56
+      AMIID: ami-04c83aeb9ee5d65e7
     ap-south-1:
-      AMIID: ami-0a22cfbfcab40cdcf
+      AMIID: ami-00831800467f12dd1
     ap-southeast-1:
-      AMIID: ami-0aa665ac55e441580
+      AMIID: ami-033d8247bc40e20b6
     ap-southeast-2:
-      AMIID: ami-024918da7f397bd33
+      AMIID: ami-081a526ad91664f63
     ca-central-1:
-      AMIID: ami-07723ed5cfbaa52a5
+      AMIID: ami-04cc6d91f8983ff9b
     eu-central-1:
-      AMIID: ami-02c93b9f4cd7656e4
+      AMIID: ami-0d4a2f1c20fcc71cb
     eu-north-1:
-      AMIID: ami-0bd13b2c265336401
+      AMIID: ami-04190ab7f910bdf57
     eu-west-1:
-      AMIID: ami-035673bec5dae8c10
+      AMIID: ami-0ba0572dfdc4b3edc
     eu-west-2:
-      AMIID: ami-0a9b9859698e17e83
+      AMIID: ami-0d4321eea796fa645
     eu-west-3:
-      AMIID: ami-0a33ef66a391cb2a9
+      AMIID: ami-0f209d0bb2c44ea6c
     sa-east-1:
-      AMIID: ami-0df782841c055e466
+      AMIID: ami-0d3845dd5cd079706
     us-east-1:
-      AMIID: ami-06ceb6b6dca8ff42f
+      AMIID: ami-0cad6ee50670e3d0e
     us-east-2:
-      AMIID: ami-02a3559cb6dfe5121
+      AMIID: ami-0c995fbcf99222492
     us-west-1:
-      AMIID: ami-081c2f17c4c0e00b7
+      AMIID: ami-0a1d34394ed12ff2a
     us-west-2:
-      AMIID: ami-08d0284faeed334a5
+      AMIID: ami-01a8b7cc84780badb
 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 cebc551..dd5dc0a 100644
--- a/tools/cfn-templates/vision-system-data-jupyter.yml
+++ b/tools/cfn-templates/vision-system-data-jupyter.yml
@@ -443,36 +443,36 @@ Mappings:
   # Ubuntu 20.04 arm64 AMIs
   AMIRegionMap:
     ap-northeast-1:
-      AMIID: ami-0eb3d9a32e9a2837e
+      AMIID: ami-0e845f4bd01a19989
     ap-northeast-2:
-      AMIID: ami-0d6dd5ea4cd9f9cd8
+      AMIID: ami-0b0dd1c713d9f4ea3
     ap-northeast-3:
-      AMIID: ami-011be5375f1591d2b
+      AMIID: ami-04c83aeb9ee5d65e7
     ap-south-1:
-      AMIID: ami-0f9d8284ff070f71e
+      AMIID: ami-00831800467f12dd1
     ap-southeast-1:
-      AMIID: ami-026877fc4bad661d3
+      AMIID: ami-033d8247bc40e20b6
     ap-southeast-2:
-      AMIID: ami-03f398a0640885fbe
+      AMIID: ami-081a526ad91664f63
     ca-central-1:
-      AMIID: ami-05f021427177342a7
+      AMIID: ami-04cc6d91f8983ff9b
     eu-central-1:
-      AMIID: ami-0bd3e1f66443d54e2
+      AMIID: ami-0d4a2f1c20fcc71cb
     eu-north-1:
-      AMIID: ami-0eb751b49dfc2e213
+      AMIID: ami-04190ab7f910bdf57
     eu-west-1:
-      AMIID: ami-0c69f641e79ac8805
+      AMIID: ami-0ba0572dfdc4b3edc
     eu-west-2:
-      AMIID: ami-0f637511a221362ce
+      AMIID: ami-0d4321eea796fa645
     eu-west-3:
-      AMIID: ami-0a6745c3030cea715
+      AMIID: ami-0f209d0bb2c44ea6c
     sa-east-1:
-      AMIID: ami-07ec8222251bdac42
+      AMIID: ami-0d3845dd5cd079706
     us-east-1:
-      AMIID: ami-0d5c15482d8d244d3
+      AMIID: ami-0cad6ee50670e3d0e
     us-east-2:
-      AMIID: ami-06925e02bf2075947
+      AMIID: ami-0c995fbcf99222492
     us-west-1:
-      AMIID: ami-00455a0097fe944b4
+      AMIID: ami-0a1d34394ed12ff2a
     us-west-2:
-      AMIID: ami-01ac8d995f1367f47
+      AMIID: ami-01a8b7cc84780badb