diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index 390a3612c..bcf0ef5c9 100644
--- a/ecs/cluster-cost-optimized.yaml
+++ b/ecs/cluster-cost-optimized.yaml
@@ -175,59 +175,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-0e0c7ad40d0336284'
+      ECSAMI: 'ami-048f8e6cdddb169b2'
     'ap-south-1':
-      ECSAMI: 'ami-0d192d7b37f96a4e5'
+      ECSAMI: 'ami-030493a647e0ba449'
     'eu-south-1':
-      ECSAMI: 'ami-0e0b3868f7e82fdec'
+      ECSAMI: 'ami-071f799f4750b4e3f'
     'eu-south-2':
-      ECSAMI: 'ami-0b442915d4dc26348'
+      ECSAMI: 'ami-0cb45bd9b7313312f'
     'me-central-1':
-      ECSAMI: 'ami-094cea0e923783ee2'
+      ECSAMI: 'ami-05d53d4605d5f3fa2'
     'ca-central-1':
-      ECSAMI: 'ami-026d1591d100ae1a4'
+      ECSAMI: 'ami-079445a18d11ec016'
     'eu-central-1':
-      ECSAMI: 'ami-09e5466d2ec7c970d'
+      ECSAMI: 'ami-06525d74e250ee032'
     'eu-central-2':
-      ECSAMI: 'ami-00afbe6c31512f3fd'
+      ECSAMI: 'ami-046e4d87da74d4cb1'
     'us-west-1':
-      ECSAMI: 'ami-080ea439df212d0a2'
+      ECSAMI: 'ami-0a46e50ca5d942c61'
     'us-west-2':
-      ECSAMI: 'ami-014cdb1bfb3b2584f'
+      ECSAMI: 'ami-0ae546d2dd33d2039'
     'af-south-1':
-      ECSAMI: 'ami-0c7edbd1cc83eff04'
+      ECSAMI: 'ami-02b8a2e16243aaf03'
     'eu-north-1':
-      ECSAMI: 'ami-09d79eb23e51bff52'
+      ECSAMI: 'ami-05dc8e8e123692f3f'
     'eu-west-3':
-      ECSAMI: 'ami-0ba1059f6d5ab5097'
+      ECSAMI: 'ami-0151da05859253073'
     'eu-west-2':
-      ECSAMI: 'ami-0a9d0b31a17ab6ef5'
+      ECSAMI: 'ami-07e394e4df20de8d2'
     'eu-west-1':
-      ECSAMI: 'ami-023858f908e1b6c5a'
+      ECSAMI: 'ami-06c1d5fe67809f5dd'
     'ap-northeast-3':
-      ECSAMI: 'ami-0a3101d12fd1ae1cc'
+      ECSAMI: 'ami-0d503d3959d26f50f'
     'ap-northeast-2':
-      ECSAMI: 'ami-04eafe1b0ceb77e37'
+      ECSAMI: 'ami-06509d7f0f8f8931f'
     'me-south-1':
-      ECSAMI: 'ami-00d6193a433249190'
+      ECSAMI: 'ami-03c08f10472d27d5b'
     'ap-northeast-1':
-      ECSAMI: 'ami-0a32d9b36af77b72e'
+      ECSAMI: 'ami-02378d43835d39ff4'
     'sa-east-1':
-      ECSAMI: 'ami-04b5858f3e8ba4259'
+      ECSAMI: 'ami-03cae68c49eefd3ed'
     'ap-east-1':
-      ECSAMI: 'ami-076633aeab371fc97'
+      ECSAMI: 'ami-0f33d5dc1b58ad19b'
     'ap-southeast-1':
-      ECSAMI: 'ami-0e9a0ac4214f2ebe1'
+      ECSAMI: 'ami-009122d67aa62493d'
     'ap-southeast-2':
-      ECSAMI: 'ami-02d1d818f19a85542'
+      ECSAMI: 'ami-0dd1294c5a7395c06'
     'ap-southeast-3':
-      ECSAMI: 'ami-0727bfdc69abdc5f9'
+      ECSAMI: 'ami-0ae0499bcea7de363'
     'ap-southeast-4':
-      ECSAMI: 'ami-0a562dabc12fa238a'
+      ECSAMI: 'ami-0f1ad3311a50553ee'
     'us-east-1':
-      ECSAMI: 'ami-05e7fa5a3b6085a75'
+      ECSAMI: 'ami-0ac7415dd546fb485'
     'us-east-2':
-      ECSAMI: 'ami-06502972b2860f143'
+      ECSAMI: 'ami-0762583c8189d4204'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index 0bef2a007..a830589c6 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -207,59 +207,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-0e0c7ad40d0336284'
+      ECSAMI: 'ami-048f8e6cdddb169b2'
     'ap-south-1':
-      ECSAMI: 'ami-0d192d7b37f96a4e5'
+      ECSAMI: 'ami-030493a647e0ba449'
     'eu-south-1':
-      ECSAMI: 'ami-0e0b3868f7e82fdec'
+      ECSAMI: 'ami-071f799f4750b4e3f'
     'eu-south-2':
-      ECSAMI: 'ami-0b442915d4dc26348'
+      ECSAMI: 'ami-0cb45bd9b7313312f'
     'me-central-1':
-      ECSAMI: 'ami-094cea0e923783ee2'
+      ECSAMI: 'ami-05d53d4605d5f3fa2'
     'ca-central-1':
-      ECSAMI: 'ami-026d1591d100ae1a4'
+      ECSAMI: 'ami-079445a18d11ec016'
     'eu-central-1':
-      ECSAMI: 'ami-09e5466d2ec7c970d'
+      ECSAMI: 'ami-06525d74e250ee032'
     'eu-central-2':
-      ECSAMI: 'ami-00afbe6c31512f3fd'
+      ECSAMI: 'ami-046e4d87da74d4cb1'
     'us-west-1':
-      ECSAMI: 'ami-080ea439df212d0a2'
+      ECSAMI: 'ami-0a46e50ca5d942c61'
     'us-west-2':
-      ECSAMI: 'ami-014cdb1bfb3b2584f'
+      ECSAMI: 'ami-0ae546d2dd33d2039'
     'af-south-1':
-      ECSAMI: 'ami-0c7edbd1cc83eff04'
+      ECSAMI: 'ami-02b8a2e16243aaf03'
     'eu-north-1':
-      ECSAMI: 'ami-09d79eb23e51bff52'
+      ECSAMI: 'ami-05dc8e8e123692f3f'
     'eu-west-3':
-      ECSAMI: 'ami-0ba1059f6d5ab5097'
+      ECSAMI: 'ami-0151da05859253073'
     'eu-west-2':
-      ECSAMI: 'ami-0a9d0b31a17ab6ef5'
+      ECSAMI: 'ami-07e394e4df20de8d2'
     'eu-west-1':
-      ECSAMI: 'ami-023858f908e1b6c5a'
+      ECSAMI: 'ami-06c1d5fe67809f5dd'
     'ap-northeast-3':
-      ECSAMI: 'ami-0a3101d12fd1ae1cc'
+      ECSAMI: 'ami-0d503d3959d26f50f'
     'ap-northeast-2':
-      ECSAMI: 'ami-04eafe1b0ceb77e37'
+      ECSAMI: 'ami-06509d7f0f8f8931f'
     'me-south-1':
-      ECSAMI: 'ami-00d6193a433249190'
+      ECSAMI: 'ami-03c08f10472d27d5b'
     'ap-northeast-1':
-      ECSAMI: 'ami-0a32d9b36af77b72e'
+      ECSAMI: 'ami-02378d43835d39ff4'
     'sa-east-1':
-      ECSAMI: 'ami-04b5858f3e8ba4259'
+      ECSAMI: 'ami-03cae68c49eefd3ed'
     'ap-east-1':
-      ECSAMI: 'ami-076633aeab371fc97'
+      ECSAMI: 'ami-0f33d5dc1b58ad19b'
     'ap-southeast-1':
-      ECSAMI: 'ami-0e9a0ac4214f2ebe1'
+      ECSAMI: 'ami-009122d67aa62493d'
     'ap-southeast-2':
-      ECSAMI: 'ami-02d1d818f19a85542'
+      ECSAMI: 'ami-0dd1294c5a7395c06'
     'ap-southeast-3':
-      ECSAMI: 'ami-0727bfdc69abdc5f9'
+      ECSAMI: 'ami-0ae0499bcea7de363'
     'ap-southeast-4':
-      ECSAMI: 'ami-0a562dabc12fa238a'
+      ECSAMI: 'ami-0f1ad3311a50553ee'
     'us-east-1':
-      ECSAMI: 'ami-05e7fa5a3b6085a75'
+      ECSAMI: 'ami-0ac7415dd546fb485'
     'us-east-2':
-      ECSAMI: 'ami-06502972b2860f143'
+      ECSAMI: 'ami-0762583c8189d4204'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml
index ee57120dd..0a031f740 100644
--- a/jenkins/jenkins2-ha-agents.yaml
+++ b/jenkins/jenkins2-ha-agents.yaml
@@ -219,59 +219,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index 713cbd777..d79f314b3 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -167,59 +167,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/security/auth-proxy-ha-github-orga.yaml b/security/auth-proxy-ha-github-orga.yaml
index c2b2190ea..a9a25b927 100644
--- a/security/auth-proxy-ha-github-orga.yaml
+++ b/security/auth-proxy-ha-github-orga.yaml
@@ -145,59 +145,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/README.md b/vpc/README.md
index 4891a0c4f..f75003a56 100644
--- a/vpc/README.md
+++ b/vpc/README.md
@@ -14,5 +14,5 @@ for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output
 
 #### NATAMI
 ```
-for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output text); do ami=$(aws --region $region ec2 describe-images --filters 'Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20221209.1-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n  NATAMI: '$ami'\n"; done
+for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output text); do ami=$(aws --region $region ec2 describe-images --filters 'Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20230207.0-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n  NATAMI: '$ami'\n"; done
 ```
diff --git a/vpc/vpc-nat-instance.yaml b/vpc/vpc-nat-instance.yaml
index 408a6ef71..53857388d 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -99,57 +99,59 @@ Parameters:
 Mappings:
   RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
     'ap-south-2':
-      NATAMI: 'ami-0aafe5a7c4ec5c339'
+      NATAMI: 'ami-0797efd94fb23dfb7'
     'ap-south-1':
-      NATAMI: 'ami-017787cdc11b2806a'
+      NATAMI: 'ami-0b245de977c42d736'
     'eu-south-1':
-      NATAMI: 'ami-025b66a0fe6897a0b'
+      NATAMI: 'ami-00952b25d858433f0'
     'eu-south-2':
-      NATAMI: 'ami-01c1d6832dbe019ab'
+      NATAMI: 'ami-072b77713ad9bbcff'
     'me-central-1':
-      NATAMI: 'ami-07312342a1421c7ec'
+      NATAMI: 'ami-09a883fc723ff8dda'
     'ca-central-1':
-      NATAMI: 'ami-07aebf854a2665c05'
+      NATAMI: 'ami-01f372449a4358a4f'
     'eu-central-1':
-      NATAMI: 'ami-03521857e9ce6c826'
+      NATAMI: 'ami-01715d8c0c355259b'
     'eu-central-2':
-      NATAMI: 'ami-04923cfe81b780c2b'
+      NATAMI: 'ami-055104cd4648d953e'
     'us-west-1':
-      NATAMI: 'ami-006e79b7b72e06e6e'
+      NATAMI: 'ami-0b0e2ca505c6dd53e'
     'us-west-2':
-      NATAMI: 'ami-016ac7f84acfaff1d'
+      NATAMI: 'ami-0b8889f9dd66fbacf'
     'af-south-1':
-      NATAMI: 'ami-0d7b16db502d4ca65'
+      NATAMI: 'ami-03070ab873f51009f'
     'eu-north-1':
-      NATAMI: 'ami-058a688c4afd936f7'
+      NATAMI: 'ami-065eb10d4568d7e4c'
     'eu-west-3':
-      NATAMI: 'ami-06b56e60c930973bb'
+      NATAMI: 'ami-0cc73120b16f10fd7'
     'eu-west-2':
-      NATAMI: 'ami-0d853de95d1e94cdb'
+      NATAMI: 'ami-01ae497fdffc21d82'
     'eu-west-1':
-      NATAMI: 'ami-0beabafc82de42c0d'
+      NATAMI: 'ami-0c228558f54476b53'
     'ap-northeast-3':
-      NATAMI: 'ami-0ad109fb9737d3e49'
+      NATAMI: 'ami-07d49c41aa12eeafb'
     'ap-northeast-2':
-      NATAMI: 'ami-00afa3bdb562f5596'
+      NATAMI: 'ami-082154e7f18b8b668'
     'me-south-1':
-      NATAMI: 'ami-055a94a01498c532b'
+      NATAMI: 'ami-06a792e220bb63fa6'
     'ap-northeast-1':
-      NATAMI: 'ami-0a09a4184fb0fdc72'
+      NATAMI: 'ami-06748ad6e578e2946'
     'sa-east-1':
-      NATAMI: 'ami-0ca2359e3d88ff475'
+      NATAMI: 'ami-0f5ccf63506ec4164'
     'ap-east-1':
-      NATAMI: 'ami-0af412bca45b6c249'
+      NATAMI: 'ami-0fc1499a921d39f61'
     'ap-southeast-1':
-      NATAMI: 'ami-0929e1ac86fd58583'
+      NATAMI: 'ami-0dbb22a253fa1ae34'
     'ap-southeast-2':
-      NATAMI: 'ami-0e19553ac807f847f'
+      NATAMI: 'ami-085f4f37f811b8091'
     'ap-southeast-3':
-      NATAMI: 'ami-029fbe69980824de3'
+      NATAMI: 'ami-0cff6cb9fe28edb7c'
+    'ap-southeast-4':
+      NATAMI: 'ami-04decf96d3094cb95'
     'us-east-1':
-      NATAMI: 'ami-04027ecc3f40c1801'
+      NATAMI: 'ami-0c1062d67d276c699'
     'us-east-2':
-      NATAMI: 'ami-068fdff5c36def0f1'
+      NATAMI: 'ami-01fe19ff26b9691de'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/vpc-ssh-bastion.yaml b/vpc/vpc-ssh-bastion.yaml
index 7e3c986f1..61a53e684 100644
--- a/vpc/vpc-ssh-bastion.yaml
+++ b/vpc/vpc-ssh-bastion.yaml
@@ -91,59 +91,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/vpc-vpn-bastion.yaml b/vpc/vpc-vpn-bastion.yaml
index 8c5b71cfb..30b6f0938 100644
--- a/vpc/vpc-vpn-bastion.yaml
+++ b/vpc/vpc-vpn-bastion.yaml
@@ -133,59 +133,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/wordpress/wordpress-ha-aurora.yaml b/wordpress/wordpress-ha-aurora.yaml
index 625b3be56..1226578d7 100644
--- a/wordpress/wordpress-ha-aurora.yaml
+++ b/wordpress/wordpress-ha-aurora.yaml
@@ -191,85 +191,85 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
       PrefixListCloudFront: ''
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
       PrefixListCloudFront: ''
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
       PrefixListCloudFront: ''
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
       PrefixListCloudFront: ''
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
       PrefixListCloudFront: ''
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
       PrefixListCloudFront: 'pl-b6a144df'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index d871b8cfd..63c8d8d53 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -228,85 +228,85 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-048246bb5d8569bc6'
+      AMI: 'ami-0adddf3a62f96d1b5'
       PrefixListCloudFront: ''
     'ap-south-1':
-      AMI: 'ami-04155bc230e70436c'
+      AMI: 'ami-04de5880b95cc889b'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-030b30458ad64d1a5'
+      AMI: 'ami-01d4a9b484a05b97b'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-0aa05d0000e273011'
+      AMI: 'ami-06253e74fc19e0eb1'
       PrefixListCloudFront: ''
     'me-central-1':
-      AMI: 'ami-08979c770d5436e80'
+      AMI: 'ami-09d2c157b7a5d450c'
       PrefixListCloudFront: ''
     'ca-central-1':
-      AMI: 'ami-0541bdac22613f378'
+      AMI: 'ami-06b2d3866642ed0c9'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-0dfc8449723242e36'
+      AMI: 'ami-01aa7cea8549a00f9'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-0509f762a42daa7d9'
+      AMI: 'ami-04a5e55b40a2f4e17'
       PrefixListCloudFront: ''
     'us-west-1':
-      AMI: 'ami-005d20c35ced4dc9e'
+      AMI: 'ami-034f10b7ffb207ab9'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-0913c47048d853921'
+      AMI: 'ami-00b44d3dbe1f81742'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-0c036befd8e52887d'
+      AMI: 'ami-00e8e8209a18663e2'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-09a51d72d4fbe112f'
+      AMI: 'ami-09dcdb5d02bb278e6'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-0163afee12c55e669'
+      AMI: 'ami-0d019491f88bb6bfa'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-0b2e759b077980407'
+      AMI: 'ami-099431a4182b79e0f'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0e1dc7c0757fa9cdc'
+      AMI: 'ami-0482b9ce45184e650'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-02c87c4115ad47b94'
+      AMI: 'ami-0cad25854a164e77d'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-081a49548fc59d8fa'
+      AMI: 'ami-0e6496235b65306a3'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0f9e883b64b0ec382'
+      AMI: 'ami-0d4d8011a357df005'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0ad64728720227ff8'
+      AMI: 'ami-0e2faefe48ba06395'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-0a36129dfe2dca30a'
+      AMI: 'ami-09165e1a0a1e5de44'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-0eb5e13acd49ef200'
+      AMI: 'ami-0ebcbb292f46c7da5'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-04e6897ac54e2870f'
+      AMI: 'ami-0409b67925493d8b8'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-01ada6dc08c623d60'
+      AMI: 'ami-02ed9e6d22bd9a91b'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0e2b70963ad494ad2'
+      AMI: 'ami-0ca95a7e548d98ea2'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0de40ddaeb58da907'
+      AMI: 'ami-0b87154ecdce64563'
       PrefixListCloudFront: ''
     'us-east-1':
-      AMI: 'ami-007868005aea67c54'
+      AMI: 'ami-065bb5126e4504910'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0924fa21f01c23f6e'
+      AMI: 'ami-03dd1011b2501fbfd'
       PrefixListCloudFront: 'pl-b6a144df'
   DBServerInstanceTypeMap:
     'db.t3.micro':