diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index bcf0ef5c9..eaa886082 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-048f8e6cdddb169b2'
+      ECSAMI: 'ami-01e72381e368b0d08'
     'ap-south-1':
-      ECSAMI: 'ami-030493a647e0ba449'
+      ECSAMI: 'ami-0f2c90f81c2e95ba9'
     'eu-south-1':
-      ECSAMI: 'ami-071f799f4750b4e3f'
+      ECSAMI: 'ami-0f75ded49ca574e46'
     'eu-south-2':
-      ECSAMI: 'ami-0cb45bd9b7313312f'
+      ECSAMI: 'ami-028a57729381cf052'
     'me-central-1':
-      ECSAMI: 'ami-05d53d4605d5f3fa2'
+      ECSAMI: 'ami-006a353d33c36be9e'
     'ca-central-1':
-      ECSAMI: 'ami-079445a18d11ec016'
+      ECSAMI: 'ami-009d586d3b58869a1'
     'eu-central-1':
-      ECSAMI: 'ami-06525d74e250ee032'
+      ECSAMI: 'ami-0045f08b64385f54c'
     'eu-central-2':
-      ECSAMI: 'ami-046e4d87da74d4cb1'
+      ECSAMI: 'ami-08b769ada89a8c3df'
     'us-west-1':
-      ECSAMI: 'ami-0a46e50ca5d942c61'
+      ECSAMI: 'ami-047da9b8c209c058d'
     'us-west-2':
-      ECSAMI: 'ami-0ae546d2dd33d2039'
+      ECSAMI: 'ami-09c0b26efb864a497'
     'af-south-1':
-      ECSAMI: 'ami-02b8a2e16243aaf03'
+      ECSAMI: 'ami-06bfb8acba067ebc8'
     'eu-north-1':
-      ECSAMI: 'ami-05dc8e8e123692f3f'
+      ECSAMI: 'ami-0b9a500fd6b7c052c'
     'eu-west-3':
-      ECSAMI: 'ami-0151da05859253073'
+      ECSAMI: 'ami-09d6d8f3c2066202b'
     'eu-west-2':
-      ECSAMI: 'ami-07e394e4df20de8d2'
+      ECSAMI: 'ami-04018f95156d810bc'
     'eu-west-1':
-      ECSAMI: 'ami-06c1d5fe67809f5dd'
+      ECSAMI: 'ami-0557bea45bd2b776b'
     'ap-northeast-3':
-      ECSAMI: 'ami-0d503d3959d26f50f'
+      ECSAMI: 'ami-03f6d3943dce5a445'
     'ap-northeast-2':
-      ECSAMI: 'ami-06509d7f0f8f8931f'
+      ECSAMI: 'ami-06e0227d92da399d8'
     'me-south-1':
-      ECSAMI: 'ami-03c08f10472d27d5b'
+      ECSAMI: 'ami-0345020c3dd2bac4a'
     'ap-northeast-1':
-      ECSAMI: 'ami-02378d43835d39ff4'
+      ECSAMI: 'ami-09c4258ce9b81642c'
     'sa-east-1':
-      ECSAMI: 'ami-03cae68c49eefd3ed'
+      ECSAMI: 'ami-0df7b398ceb28b597'
     'ap-east-1':
-      ECSAMI: 'ami-0f33d5dc1b58ad19b'
+      ECSAMI: 'ami-0ab9b99eef01865f4'
     'ap-southeast-1':
-      ECSAMI: 'ami-009122d67aa62493d'
+      ECSAMI: 'ami-0c84dffba7015613c'
     'ap-southeast-2':
-      ECSAMI: 'ami-0dd1294c5a7395c06'
+      ECSAMI: 'ami-063df8a11b98dec2a'
     'ap-southeast-3':
-      ECSAMI: 'ami-0ae0499bcea7de363'
+      ECSAMI: 'ami-03aea76bf4f559458'
     'ap-southeast-4':
-      ECSAMI: 'ami-0f1ad3311a50553ee'
+      ECSAMI: 'ami-09630769254f9dbd3'
     'us-east-1':
-      ECSAMI: 'ami-0ac7415dd546fb485'
+      ECSAMI: 'ami-083cd4eb32643c8a0'
     'us-east-2':
-      ECSAMI: 'ami-0762583c8189d4204'
+      ECSAMI: 'ami-0798aaad33ff8890b'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index a830589c6..1f33cdae8 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -207,59 +207,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-048f8e6cdddb169b2'
+      ECSAMI: 'ami-01e72381e368b0d08'
     'ap-south-1':
-      ECSAMI: 'ami-030493a647e0ba449'
+      ECSAMI: 'ami-0f2c90f81c2e95ba9'
     'eu-south-1':
-      ECSAMI: 'ami-071f799f4750b4e3f'
+      ECSAMI: 'ami-0f75ded49ca574e46'
     'eu-south-2':
-      ECSAMI: 'ami-0cb45bd9b7313312f'
+      ECSAMI: 'ami-028a57729381cf052'
     'me-central-1':
-      ECSAMI: 'ami-05d53d4605d5f3fa2'
+      ECSAMI: 'ami-006a353d33c36be9e'
     'ca-central-1':
-      ECSAMI: 'ami-079445a18d11ec016'
+      ECSAMI: 'ami-009d586d3b58869a1'
     'eu-central-1':
-      ECSAMI: 'ami-06525d74e250ee032'
+      ECSAMI: 'ami-0045f08b64385f54c'
     'eu-central-2':
-      ECSAMI: 'ami-046e4d87da74d4cb1'
+      ECSAMI: 'ami-08b769ada89a8c3df'
     'us-west-1':
-      ECSAMI: 'ami-0a46e50ca5d942c61'
+      ECSAMI: 'ami-047da9b8c209c058d'
     'us-west-2':
-      ECSAMI: 'ami-0ae546d2dd33d2039'
+      ECSAMI: 'ami-09c0b26efb864a497'
     'af-south-1':
-      ECSAMI: 'ami-02b8a2e16243aaf03'
+      ECSAMI: 'ami-06bfb8acba067ebc8'
     'eu-north-1':
-      ECSAMI: 'ami-05dc8e8e123692f3f'
+      ECSAMI: 'ami-0b9a500fd6b7c052c'
     'eu-west-3':
-      ECSAMI: 'ami-0151da05859253073'
+      ECSAMI: 'ami-09d6d8f3c2066202b'
     'eu-west-2':
-      ECSAMI: 'ami-07e394e4df20de8d2'
+      ECSAMI: 'ami-04018f95156d810bc'
     'eu-west-1':
-      ECSAMI: 'ami-06c1d5fe67809f5dd'
+      ECSAMI: 'ami-0557bea45bd2b776b'
     'ap-northeast-3':
-      ECSAMI: 'ami-0d503d3959d26f50f'
+      ECSAMI: 'ami-03f6d3943dce5a445'
     'ap-northeast-2':
-      ECSAMI: 'ami-06509d7f0f8f8931f'
+      ECSAMI: 'ami-06e0227d92da399d8'
     'me-south-1':
-      ECSAMI: 'ami-03c08f10472d27d5b'
+      ECSAMI: 'ami-0345020c3dd2bac4a'
     'ap-northeast-1':
-      ECSAMI: 'ami-02378d43835d39ff4'
+      ECSAMI: 'ami-09c4258ce9b81642c'
     'sa-east-1':
-      ECSAMI: 'ami-03cae68c49eefd3ed'
+      ECSAMI: 'ami-0df7b398ceb28b597'
     'ap-east-1':
-      ECSAMI: 'ami-0f33d5dc1b58ad19b'
+      ECSAMI: 'ami-0ab9b99eef01865f4'
     'ap-southeast-1':
-      ECSAMI: 'ami-009122d67aa62493d'
+      ECSAMI: 'ami-0c84dffba7015613c'
     'ap-southeast-2':
-      ECSAMI: 'ami-0dd1294c5a7395c06'
+      ECSAMI: 'ami-063df8a11b98dec2a'
     'ap-southeast-3':
-      ECSAMI: 'ami-0ae0499bcea7de363'
+      ECSAMI: 'ami-03aea76bf4f559458'
     'ap-southeast-4':
-      ECSAMI: 'ami-0f1ad3311a50553ee'
+      ECSAMI: 'ami-09630769254f9dbd3'
     'us-east-1':
-      ECSAMI: 'ami-0ac7415dd546fb485'
+      ECSAMI: 'ami-083cd4eb32643c8a0'
     'us-east-2':
-      ECSAMI: 'ami-0762583c8189d4204'
+      ECSAMI: 'ami-0798aaad33ff8890b'
 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 a5a9802a1..7849a8d1e 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-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
+      AMI: 'ami-04bea9d43f00632ba'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
+      AMI: 'ami-0dc41824b46d85941'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index f6ffe564f..4639d3058 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -167,59 +167,59 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
+      AMI: 'ami-04bea9d43f00632ba'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
+      AMI: 'ami-0dc41824b46d85941'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
 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 a9a25b927..3311341fd 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-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
+      AMI: 'ami-04bea9d43f00632ba'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
+      AMI: 'ami-0dc41824b46d85941'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/README.md b/vpc/README.md
index f75003a56..63a9f13c3 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.20230207.0-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.20230306.1-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 53857388d..9f148785d 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -99,59 +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-0797efd94fb23dfb7'
+      NATAMI: 'ami-07252d2860ba2f391'
     'ap-south-1':
-      NATAMI: 'ami-0b245de977c42d736'
+      NATAMI: 'ami-0bc953b925840ed5f'
     'eu-south-1':
-      NATAMI: 'ami-00952b25d858433f0'
+      NATAMI: 'ami-005cf308cf6310e8f'
     'eu-south-2':
-      NATAMI: 'ami-072b77713ad9bbcff'
+      NATAMI: 'ami-0824b0a59bc2d6731'
     'me-central-1':
-      NATAMI: 'ami-09a883fc723ff8dda'
+      NATAMI: 'ami-0b9f2aa629c63c842'
     'ca-central-1':
-      NATAMI: 'ami-01f372449a4358a4f'
+      NATAMI: 'ami-0932fb81094fb2e4f'
     'eu-central-1':
-      NATAMI: 'ami-01715d8c0c355259b'
+      NATAMI: 'ami-0de5ee27839dc4d68'
     'eu-central-2':
-      NATAMI: 'ami-055104cd4648d953e'
+      NATAMI: 'ami-0bcd1608151e8e221'
     'us-west-1':
-      NATAMI: 'ami-0b0e2ca505c6dd53e'
+      NATAMI: 'ami-0fe52da3c3c09c66e'
     'us-west-2':
-      NATAMI: 'ami-0b8889f9dd66fbacf'
+      NATAMI: 'ami-0e15500383b995faa'
     'af-south-1':
-      NATAMI: 'ami-03070ab873f51009f'
+      NATAMI: 'ami-08d57445b1747ad48'
     'eu-north-1':
-      NATAMI: 'ami-065eb10d4568d7e4c'
+      NATAMI: 'ami-01f31c7901a296413'
     'eu-west-3':
-      NATAMI: 'ami-0cc73120b16f10fd7'
+      NATAMI: 'ami-0e57cd5dc4d75fe0e'
     'eu-west-2':
-      NATAMI: 'ami-01ae497fdffc21d82'
+      NATAMI: 'ami-0917ed0a91cfc22a6'
     'eu-west-1':
-      NATAMI: 'ami-0c228558f54476b53'
+      NATAMI: 'ami-065aecd19bdfa9d6c'
     'ap-northeast-3':
-      NATAMI: 'ami-07d49c41aa12eeafb'
+      NATAMI: 'ami-04f67cc2738b9bab6'
     'ap-northeast-2':
-      NATAMI: 'ami-082154e7f18b8b668'
+      NATAMI: 'ami-0542b4bddc3e6befc'
     'me-south-1':
-      NATAMI: 'ami-06a792e220bb63fa6'
+      NATAMI: 'ami-0a9ba1005c9f04ed5'
     'ap-northeast-1':
-      NATAMI: 'ami-06748ad6e578e2946'
+      NATAMI: 'ami-0d8bcd0399e723603'
     'sa-east-1':
-      NATAMI: 'ami-0f5ccf63506ec4164'
+      NATAMI: 'ami-0dfaaaf38208919fb'
     'ap-east-1':
-      NATAMI: 'ami-0fc1499a921d39f61'
+      NATAMI: 'ami-021ae46ad207092d3'
     'ap-southeast-1':
-      NATAMI: 'ami-0dbb22a253fa1ae34'
+      NATAMI: 'ami-04b414ee0c4c74489'
     'ap-southeast-2':
-      NATAMI: 'ami-085f4f37f811b8091'
+      NATAMI: 'ami-0b73a22207b761405'
     'ap-southeast-3':
-      NATAMI: 'ami-0cff6cb9fe28edb7c'
+      NATAMI: 'ami-0f028bf264a0ff4b3'
     'ap-southeast-4':
-      NATAMI: 'ami-04decf96d3094cb95'
+      NATAMI: 'ami-0908d5604826c3cdf'
     'us-east-1':
-      NATAMI: 'ami-0c1062d67d276c699'
+      NATAMI: 'ami-0356fe6f21ab7c13e'
     'us-east-2':
-      NATAMI: 'ami-01fe19ff26b9691de'
+      NATAMI: 'ami-0b1e3f0b8e4e79a91'
 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 61a53e684..f3841ed83 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-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
+      AMI: 'ami-04bea9d43f00632ba'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
+      AMI: 'ami-0dc41824b46d85941'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
 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 a29e73d33..d667196fc 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-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
+      AMI: 'ami-04bea9d43f00632ba'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
+      AMI: 'ami-0dc41824b46d85941'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
 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 1226578d7..6f7ca095c 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-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
       PrefixListCloudFront: ''
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
       PrefixListCloudFront: ''
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
-      PrefixListCloudFront: ''
+      AMI: 'ami-04bea9d43f00632ba'
+      PrefixListCloudFront: 'pl-05266a86378662c23'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
-      PrefixListCloudFront: ''
+      AMI: 'ami-0dc41824b46d85941'
+      PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
       PrefixListCloudFront: ''
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
       PrefixListCloudFront: 'pl-b6a144df'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index 63c8d8d53..cb4225200 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -228,85 +228,85 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0adddf3a62f96d1b5'
+      AMI: 'ami-0d7a35ac06b28158d'
       PrefixListCloudFront: ''
     'ap-south-1':
-      AMI: 'ami-04de5880b95cc889b'
+      AMI: 'ami-0818919f15d5129fe'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-01d4a9b484a05b97b'
+      AMI: 'ami-0f48431dc55f68772'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-06253e74fc19e0eb1'
+      AMI: 'ami-0e970462908a84fe0'
       PrefixListCloudFront: ''
     'me-central-1':
-      AMI: 'ami-09d2c157b7a5d450c'
-      PrefixListCloudFront: ''
+      AMI: 'ami-04bea9d43f00632ba'
+      PrefixListCloudFront: 'pl-05266a86378662c23'
     'ca-central-1':
-      AMI: 'ami-06b2d3866642ed0c9'
+      AMI: 'ami-0033781d60b76b298'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-01aa7cea8549a00f9'
+      AMI: 'ami-02d459c4c525ef67e'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-04a5e55b40a2f4e17'
-      PrefixListCloudFront: ''
+      AMI: 'ami-0dc41824b46d85941'
+      PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-034f10b7ffb207ab9'
+      AMI: 'ami-09769665bcecef28b'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-00b44d3dbe1f81742'
+      AMI: 'ami-0f3b366cff2e46862'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-00e8e8209a18663e2'
+      AMI: 'ami-03a102579c4af8298'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-09dcdb5d02bb278e6'
+      AMI: 'ami-03abbbfd184c5f585'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-0d019491f88bb6bfa'
+      AMI: 'ami-018c9ff1993c25249'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-099431a4182b79e0f'
+      AMI: 'ami-02b9b693377a07477'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0482b9ce45184e650'
+      AMI: 'ami-05247819264504af0'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0cad25854a164e77d'
+      AMI: 'ami-04ba9be806922185f'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-0e6496235b65306a3'
+      AMI: 'ami-035fb3f7716a5f9dd'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0d4d8011a357df005'
+      AMI: 'ami-0171bfb47f6d8eb47'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0e2faefe48ba06395'
+      AMI: 'ami-05112363dbe951480'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-09165e1a0a1e5de44'
+      AMI: 'ami-06fdd575cd7adafbc'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-0ebcbb292f46c7da5'
+      AMI: 'ami-0482649fd6459dfd7'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-0409b67925493d8b8'
+      AMI: 'ami-09535ad6b48711f78'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02ed9e6d22bd9a91b'
+      AMI: 'ami-07a818e79f8b47795'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0ca95a7e548d98ea2'
+      AMI: 'ami-0c3ac112d26beab09'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0b87154ecdce64563'
+      AMI: 'ami-0e24a35af10afa684'
       PrefixListCloudFront: ''
     'us-east-1':
-      AMI: 'ami-065bb5126e4504910'
+      AMI: 'ami-09a0dac4253cfa03f'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-03dd1011b2501fbfd'
+      AMI: 'ami-06f37ac0a40530750'
       PrefixListCloudFront: 'pl-b6a144df'
   DBServerInstanceTypeMap:
     'db.t3.micro':