diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index 8ca64f1fe..344f00724 100644
--- a/ecs/cluster-cost-optimized.yaml
+++ b/ecs/cluster-cost-optimized.yaml
@@ -175,49 +175,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      ECSAMI: 'ami-02c86425769f9b204'
+      ECSAMI: 'ami-047693ce3560b17e5'
     'eu-north-1':
-      ECSAMI: 'ami-06f303ac89c0fbfc4'
+      ECSAMI: 'ami-0662451ff2feff209'
     'ap-south-1':
-      ECSAMI: 'ami-07f167b88a67a6de5'
+      ECSAMI: 'ami-0416723f8e455592c'
     'eu-west-3':
-      ECSAMI: 'ami-0291c1a4d932df199'
+      ECSAMI: 'ami-0c640b37549b56866'
     'eu-west-2':
-      ECSAMI: 'ami-0deaaae588654f32e'
+      ECSAMI: 'ami-0fd6a5614931e9e58'
     'eu-south-1':
-      ECSAMI: 'ami-092153b1cc0936728'
+      ECSAMI: 'ami-07709a52b2ac61da9'
     'eu-west-1':
-      ECSAMI: 'ami-04030f151d88f43bc'
+      ECSAMI: 'ami-002e2fef4b94f8fd0'
     'ap-northeast-3':
-      ECSAMI: 'ami-0057e1ea4f3bb9f49'
+      ECSAMI: 'ami-0119dac82a793018f'
     'ap-northeast-2':
-      ECSAMI: 'ami-0d54f5e9cf296bc58'
+      ECSAMI: 'ami-0a6677068219e7cfc'
     'me-south-1':
-      ECSAMI: 'ami-0706e0bc92f83bf19'
+      ECSAMI: 'ami-01cfe33a5914844b7'
     'ap-northeast-1':
-      ECSAMI: 'ami-026d869c538fb9cad'
+      ECSAMI: 'ami-0d7f22d6755eea788'
+    'me-central-1':
+      ECSAMI: 'ami-03d19c1410cc0d0d9'
     'sa-east-1':
-      ECSAMI: 'ami-0c0d9c8dc4e598b9f'
+      ECSAMI: 'ami-0d081bb03165198ac'
     'ca-central-1':
-      ECSAMI: 'ami-01619c2f6ed732c5c'
+      ECSAMI: 'ami-035efbeaa56bdc777'
     'ap-east-1':
-      ECSAMI: 'ami-05383ea897f4fc1db'
+      ECSAMI: 'ami-0322456df4829a16f'
     'ap-southeast-1':
-      ECSAMI: 'ami-0ac5c7ab6f0eab7c8'
+      ECSAMI: 'ami-0855712a34b3f2bf5'
     'ap-southeast-2':
-      ECSAMI: 'ami-0b76e759367f1f508'
+      ECSAMI: 'ami-0d03e0afc8a3a307d'
     'ap-southeast-3':
-      ECSAMI: 'ami-0f464bd95be75df4c'
+      ECSAMI: 'ami-05960f81192810e85'
     'eu-central-1':
-      ECSAMI: 'ami-0da25582fb45be38c'
+      ECSAMI: 'ami-0319b5b60d7feac49'
     'us-east-1':
-      ECSAMI: 'ami-0002eba4f029226a3'
+      ECSAMI: 'ami-07da26e39622a03dc'
     'us-east-2':
-      ECSAMI: 'ami-0fd94748ae6f66327'
+      ECSAMI: 'ami-0ee5088f037f0da87'
     'us-west-1':
-      ECSAMI: 'ami-0b18b26e62756088c'
+      ECSAMI: 'ami-0f71b77f57e47333c'
     'us-west-2':
-      ECSAMI: 'ami-069acfe015e16939a'
+      ECSAMI: 'ami-005b5f3941c234694'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index 4bdcde20f..c244529b5 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -207,49 +207,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      ECSAMI: 'ami-02c86425769f9b204'
+      ECSAMI: 'ami-047693ce3560b17e5'
     'eu-north-1':
-      ECSAMI: 'ami-06f303ac89c0fbfc4'
+      ECSAMI: 'ami-0662451ff2feff209'
     'ap-south-1':
-      ECSAMI: 'ami-07f167b88a67a6de5'
+      ECSAMI: 'ami-0416723f8e455592c'
     'eu-west-3':
-      ECSAMI: 'ami-0291c1a4d932df199'
+      ECSAMI: 'ami-0c640b37549b56866'
     'eu-west-2':
-      ECSAMI: 'ami-0deaaae588654f32e'
+      ECSAMI: 'ami-0fd6a5614931e9e58'
     'eu-south-1':
-      ECSAMI: 'ami-092153b1cc0936728'
+      ECSAMI: 'ami-07709a52b2ac61da9'
     'eu-west-1':
-      ECSAMI: 'ami-04030f151d88f43bc'
+      ECSAMI: 'ami-002e2fef4b94f8fd0'
     'ap-northeast-3':
-      ECSAMI: 'ami-0057e1ea4f3bb9f49'
+      ECSAMI: 'ami-0119dac82a793018f'
     'ap-northeast-2':
-      ECSAMI: 'ami-0d54f5e9cf296bc58'
+      ECSAMI: 'ami-0a6677068219e7cfc'
     'me-south-1':
-      ECSAMI: 'ami-0706e0bc92f83bf19'
+      ECSAMI: 'ami-01cfe33a5914844b7'
     'ap-northeast-1':
-      ECSAMI: 'ami-026d869c538fb9cad'
+      ECSAMI: 'ami-0d7f22d6755eea788'
+    'me-central-1':
+      ECSAMI: 'ami-03d19c1410cc0d0d9'
     'sa-east-1':
-      ECSAMI: 'ami-0c0d9c8dc4e598b9f'
+      ECSAMI: 'ami-0d081bb03165198ac'
     'ca-central-1':
-      ECSAMI: 'ami-01619c2f6ed732c5c'
+      ECSAMI: 'ami-035efbeaa56bdc777'
     'ap-east-1':
-      ECSAMI: 'ami-05383ea897f4fc1db'
+      ECSAMI: 'ami-0322456df4829a16f'
     'ap-southeast-1':
-      ECSAMI: 'ami-0ac5c7ab6f0eab7c8'
+      ECSAMI: 'ami-0855712a34b3f2bf5'
     'ap-southeast-2':
-      ECSAMI: 'ami-0b76e759367f1f508'
+      ECSAMI: 'ami-0d03e0afc8a3a307d'
     'ap-southeast-3':
-      ECSAMI: 'ami-0f464bd95be75df4c'
+      ECSAMI: 'ami-05960f81192810e85'
     'eu-central-1':
-      ECSAMI: 'ami-0da25582fb45be38c'
+      ECSAMI: 'ami-0319b5b60d7feac49'
     'us-east-1':
-      ECSAMI: 'ami-0002eba4f029226a3'
+      ECSAMI: 'ami-07da26e39622a03dc'
     'us-east-2':
-      ECSAMI: 'ami-0fd94748ae6f66327'
+      ECSAMI: 'ami-0ee5088f037f0da87'
     'us-west-1':
-      ECSAMI: 'ami-0b18b26e62756088c'
+      ECSAMI: 'ami-0f71b77f57e47333c'
     'us-west-2':
-      ECSAMI: 'ami-069acfe015e16939a'
+      ECSAMI: 'ami-005b5f3941c234694'
 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 5473d8f48..331887024 100644
--- a/jenkins/jenkins2-ha-agents.yaml
+++ b/jenkins/jenkins2-ha-agents.yaml
@@ -219,49 +219,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index 3e7e00c79..5432b6f01 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -167,49 +167,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
 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 83d8a3728..5fc68cfac 100644
--- a/security/auth-proxy-ha-github-orga.yaml
+++ b/security/auth-proxy-ha-github-orga.yaml
@@ -145,49 +145,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/README.md b/vpc/README.md
index d4d64a873..23c7dbfe8 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.20220802.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.20220907.3-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 b979aa7d3..8fecf495e 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -99,49 +99,51 @@ Parameters:
 Mappings:
   RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
     'af-south-1':
-      NATAMI: 'ami-007da8686850bd56f'
+      NATAMI: 'ami-0d8173c9560d1db23'
     'eu-north-1':
-      NATAMI: 'ami-0a9b1be2951ef12c3'
+      NATAMI: 'ami-099dda2264bf52ca7'
     'ap-south-1':
-      NATAMI: 'ami-0e813f885a024399b'
+      NATAMI: 'ami-0fe932cb431f5e326'
     'eu-west-3':
-      NATAMI: 'ami-00ec2680d0d697ad0'
+      NATAMI: 'ami-0d7c7fe775a76686f'
     'eu-west-2':
-      NATAMI: 'ami-011ad77f622e0c2fb'
+      NATAMI: 'ami-05b9ce74a38f33649'
     'eu-south-1':
-      NATAMI: 'ami-0fbbb2c6a4ec1e30d'
+      NATAMI: 'ami-004b73ef2def09cae'
     'eu-west-1':
-      NATAMI: 'ami-0a56c2c5f57ae7f9a'
+      NATAMI: 'ami-002d4e248602ba877'
     'ap-northeast-3':
-      NATAMI: 'ami-05bd005a72b2ad111'
+      NATAMI: 'ami-0ce80f38c7b494641'
     'ap-northeast-2':
-      NATAMI: 'ami-0e3e1b45a02a17920'
+      NATAMI: 'ami-0ddf5e27c82e49afc'
     'me-south-1':
-      NATAMI: 'ami-03cba91974d807acf'
+      NATAMI: 'ami-064327e370e249f28'
     'ap-northeast-1':
-      NATAMI: 'ami-0a7529bfaaf195a8c'
+      NATAMI: 'ami-08369ce44e913655c'
+    'me-central-1':
+      NATAMI: 'ami-0b8a84319f4f67d48'
     'sa-east-1':
-      NATAMI: 'ami-08936d1fc0040fc58'
+      NATAMI: 'ami-0e531a83833a1c0be'
     'ca-central-1':
-      NATAMI: 'ami-0e9d1e46c539f526c'
+      NATAMI: 'ami-0e1db7c672a3400fc'
     'ap-east-1':
-      NATAMI: 'ami-0c4e0cd8bb5f12fe9'
+      NATAMI: 'ami-0fef2b749732ab380'
     'ap-southeast-1':
-      NATAMI: 'ami-018cd92db227b86e1'
+      NATAMI: 'ami-0b8daac939ebab0cd'
     'ap-southeast-2':
-      NATAMI: 'ami-0e72186c833bb56c0'
+      NATAMI: 'ami-0d142f08d13879a08'
     'ap-southeast-3':
-      NATAMI: 'ami-060fa367685ed9d0a'
+      NATAMI: 'ami-02b227f6a66c3ce47'
     'eu-central-1':
-      NATAMI: 'ami-00371432b1bceae1d'
+      NATAMI: 'ami-0676d91857bf1c8e1'
     'us-east-1':
-      NATAMI: 'ami-05ed49079214c998a'
+      NATAMI: 'ami-01e8be21b15b706b3'
     'us-east-2':
-      NATAMI: 'ami-0a8c79bd758e15082'
+      NATAMI: 'ami-0b81de1864465dcc2'
     'us-west-1':
-      NATAMI: 'ami-01a3c8305ad5936a2'
+      NATAMI: 'ami-033fcfcd060fd492e'
     'us-west-2':
-      NATAMI: 'ami-054c198626cd4a7c6'
+      NATAMI: 'ami-08388cc24a4260acc'
 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 431e76124..dd3536fa4 100644
--- a/vpc/vpc-ssh-bastion.yaml
+++ b/vpc/vpc-ssh-bastion.yaml
@@ -91,49 +91,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
 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 8e0354e71..bc5ad59d0 100644
--- a/vpc/vpc-vpn-bastion.yaml
+++ b/vpc/vpc-vpn-bastion.yaml
@@ -133,49 +133,51 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
 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 f85066dc5..ff8abec3e 100644
--- a/wordpress/wordpress-ha-aurora.yaml
+++ b/wordpress/wordpress-ha-aurora.yaml
@@ -191,70 +191,73 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
       PrefixListCloudFront: 'pl-fab65393'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
       PrefixListCloudFront: 'pl-58a04531'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
+      PrefixListCloudFront: ''
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
       PrefixListCloudFront: 'pl-5da64334'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
       PrefixListCloudFront: 'pl-38a64351'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
       PrefixListCloudFront: 'pl-bca247d5'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
       PrefixListCloudFront: 'pl-a3a144ca'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
       PrefixListCloudFront: 'pl-b6a144df'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
       PrefixListCloudFront: 'pl-82a045eb'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index be5cb9d0a..30f258aa3 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -228,70 +228,73 @@ Parameters:
 Mappings:
   RegionMap:
     'af-south-1':
-      AMI: 'ami-04f95a4a3609e4cf3'
+      AMI: 'ami-0c8f4401bffbcc52b'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0b87edaa84d7c45ce'
+      AMI: 'ami-05807b6ca4228ed22'
       PrefixListCloudFront: 'pl-fab65393'
     'ap-south-1':
-      AMI: 'ami-068cda7597e78094b'
+      AMI: 'ami-064687fa05edcd686'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-west-3':
-      AMI: 'ami-002e2b155689f6e23'
+      AMI: 'ami-0eeba548a1a39b254'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-0c496e8bea496ed67'
+      AMI: 'ami-023665fdad063c8a9'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-south-1':
-      AMI: 'ami-07a10ce489fece5f8'
+      AMI: 'ami-0024dc61bc2f3d60f'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-west-1':
-      AMI: 'ami-038e9cdc714b15936'
+      AMI: 'ami-0af7a5885e3ff0439'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-00d7ff299ded74625'
+      AMI: 'ami-071e62426740a4919'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-066d41d96fc160063'
+      AMI: 'ami-0bb19571ca7f4bf31'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-090a20e93e6698582'
+      AMI: 'ami-02f339e26fdbed7a9'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-0b069de314c9ab4c4'
+      AMI: 'ami-01154243795368525'
       PrefixListCloudFront: 'pl-58a04531'
+    'me-central-1':
+      AMI: 'ami-0b2373ec0e87325e0'
+      PrefixListCloudFront: ''
     'sa-east-1':
-      AMI: 'ami-058f4e20c17271f68'
+      AMI: 'ami-0e41adb6f66146d4f'
       PrefixListCloudFront: 'pl-5da64334'
     'ca-central-1':
-      AMI: 'ami-0300c413e2de1804e'
+      AMI: 'ami-0d681e46bfc23b29c'
       PrefixListCloudFront: 'pl-38a64351'
     'ap-east-1':
-      AMI: 'ami-051ec00661c466b27'
+      AMI: 'ami-0481a59051168daa6'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-013586750d303f89d'
+      AMI: 'ami-08326d8b49f61f528'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-0336d88ead51a9210'
+      AMI: 'ami-00aa03f67b64f75dd'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-077238a133cf52716'
+      AMI: 'ami-013da7ea7023d5f7c'
       PrefixListCloudFront: 'pl-bca247d5'
     'eu-central-1':
-      AMI: 'ami-041e64b0129bffca9'
+      AMI: 'ami-08658d5197becde34'
       PrefixListCloudFront: 'pl-a3a144ca'
     'us-east-1':
-      AMI: 'ami-02538f8925e3aa27a'
+      AMI: 'ami-0464d49b8794eba32'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0ee5c62243ab25259'
+      AMI: 'ami-058d017bb0407da05'
       PrefixListCloudFront: 'pl-b6a144df'
     'us-west-1':
-      AMI: 'ami-0019ad94c6124959d'
+      AMI: 'ami-0147bd0a180d521bd'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-07d59d159373b8030'
+      AMI: 'ami-0620766f9d10d6c9e'
       PrefixListCloudFront: 'pl-82a045eb'
   DBServerInstanceTypeMap:
     'db.t3.micro':