diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index f99c7150e..b96a8af7e 100644
--- a/ecs/cluster-cost-optimized.yaml
+++ b/ecs/cluster-cost-optimized.yaml
@@ -174,52 +174,56 @@ Parameters:
     MaxValue: 3600
 Mappings:
   RegionMap:
+    'ap-south-1':
+      ECSAMI: 'ami-081a6bc7bdbafd63a'
+    'eu-south-1':
+      ECSAMI: 'ami-0d5e6c5081a715733'
+    'eu-south-2':
+      ECSAMI: 'ami-071c2c0a2032e665c'
+    'me-central-1':
+      ECSAMI: 'ami-0d1066a407c3c3132'
+    'ca-central-1':
+      ECSAMI: 'ami-0ac94e845e99feb00'
+    'eu-central-1':
+      ECSAMI: 'ami-0fab44817c875e415'
+    'eu-central-2':
+      ECSAMI: 'ami-0424108b6e72afd96'
+    'us-west-1':
+      ECSAMI: 'ami-04dda3eb78d3c76f9'
+    'us-west-2':
+      ECSAMI: 'ami-00b9dff790e659df2'
     'af-south-1':
-      ECSAMI: 'ami-0be224b4d422ddffa'
+      ECSAMI: 'ami-0d8543bf2163740ae'
     'eu-north-1':
-      ECSAMI: 'ami-04c4cea5d874eb480'
-    'ap-south-1':
-      ECSAMI: 'ami-08db0e1881e30be69'
+      ECSAMI: 'ami-047ff366619a25378'
     'eu-west-3':
-      ECSAMI: 'ami-05f31f29ba1347d15'
+      ECSAMI: 'ami-072439f1b747e6f66'
     'eu-west-2':
-      ECSAMI: 'ami-02bfd81009b599d71'
-    'eu-south-1':
-      ECSAMI: 'ami-035d3a234a62abd5b'
+      ECSAMI: 'ami-0d930fe5ea148b740'
     'eu-west-1':
-      ECSAMI: 'ami-0bfc7754dbd389d88'
+      ECSAMI: 'ami-08c011700cf146b89'
     'ap-northeast-3':
-      ECSAMI: 'ami-0569b7f3189a3ec52'
+      ECSAMI: 'ami-0d66f1af6b1948b05'
     'ap-northeast-2':
-      ECSAMI: 'ami-0dfe299a8a7fe500e'
+      ECSAMI: 'ami-07436a5dd052caf02'
     'me-south-1':
-      ECSAMI: 'ami-0ed86633a7af964f7'
+      ECSAMI: 'ami-03da374fc56be95ea'
     'ap-northeast-1':
-      ECSAMI: 'ami-0ed1560bb509908b1'
-    'me-central-1':
-      ECSAMI: 'ami-0d5eaf70cf19ee11f'
+      ECSAMI: 'ami-0fcfb0266308303f6'
     'sa-east-1':
-      ECSAMI: 'ami-027961ea9f99b94b8'
-    'ca-central-1':
-      ECSAMI: 'ami-0720b74139c459b83'
+      ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
     'ap-east-1':
-      ECSAMI: 'ami-0ac9d29184f2949e4'
+      ECSAMI: 'ami-0a4fbf7f8b0db42a4'
     'ap-southeast-1':
-      ECSAMI: 'ami-0996cfb3acf118b24'
+      ECSAMI: 'ami-0b91f3efad17de577'
     'ap-southeast-2':
-      ECSAMI: 'ami-0ace32fdb211c83e0'
+      ECSAMI: 'ami-016dfbb93297168e3'
     'ap-southeast-3':
-      ECSAMI: 'ami-0cf92ed4ce1523264'
-    'eu-central-1':
-      ECSAMI: 'ami-0479e02f9b310c857'
+      ECSAMI: 'ami-01f3cb07cc12e56c2'
     'us-east-1':
-      ECSAMI: 'ami-00eb90638788e810f'
+      ECSAMI: 'ami-0fe5f366c083f59ca'
     'us-east-2':
-      ECSAMI: 'ami-0b0033935e98632de'
-    'us-west-1':
-      ECSAMI: 'ami-03d937713d2d29e68'
-    'us-west-2':
-      ECSAMI: 'ami-0091142fcd273792c'
+      ECSAMI: 'ami-04474aeb33af328e7'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index 3fb13a1bd..0ca310cb7 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -206,52 +206,56 @@ Parameters:
     ConstraintDescription: 'Must be >= 2'
 Mappings:
   RegionMap:
+    'ap-south-1':
+      ECSAMI: 'ami-081a6bc7bdbafd63a'
+    'eu-south-1':
+      ECSAMI: 'ami-0d5e6c5081a715733'
+    'eu-south-2':
+      ECSAMI: 'ami-071c2c0a2032e665c'
+    'me-central-1':
+      ECSAMI: 'ami-0d1066a407c3c3132'
+    'ca-central-1':
+      ECSAMI: 'ami-0ac94e845e99feb00'
+    'eu-central-1':
+      ECSAMI: 'ami-0fab44817c875e415'
+    'eu-central-2':
+      ECSAMI: 'ami-0424108b6e72afd96'
+    'us-west-1':
+      ECSAMI: 'ami-04dda3eb78d3c76f9'
+    'us-west-2':
+      ECSAMI: 'ami-00b9dff790e659df2'
     'af-south-1':
-      ECSAMI: 'ami-0be224b4d422ddffa'
+      ECSAMI: 'ami-0d8543bf2163740ae'
     'eu-north-1':
-      ECSAMI: 'ami-04c4cea5d874eb480'
-    'ap-south-1':
-      ECSAMI: 'ami-08db0e1881e30be69'
+      ECSAMI: 'ami-047ff366619a25378'
     'eu-west-3':
-      ECSAMI: 'ami-05f31f29ba1347d15'
+      ECSAMI: 'ami-072439f1b747e6f66'
     'eu-west-2':
-      ECSAMI: 'ami-02bfd81009b599d71'
-    'eu-south-1':
-      ECSAMI: 'ami-035d3a234a62abd5b'
+      ECSAMI: 'ami-0d930fe5ea148b740'
     'eu-west-1':
-      ECSAMI: 'ami-0bfc7754dbd389d88'
+      ECSAMI: 'ami-08c011700cf146b89'
     'ap-northeast-3':
-      ECSAMI: 'ami-0569b7f3189a3ec52'
+      ECSAMI: 'ami-0d66f1af6b1948b05'
     'ap-northeast-2':
-      ECSAMI: 'ami-0dfe299a8a7fe500e'
+      ECSAMI: 'ami-07436a5dd052caf02'
     'me-south-1':
-      ECSAMI: 'ami-0ed86633a7af964f7'
+      ECSAMI: 'ami-03da374fc56be95ea'
     'ap-northeast-1':
-      ECSAMI: 'ami-0ed1560bb509908b1'
-    'me-central-1':
-      ECSAMI: 'ami-0d5eaf70cf19ee11f'
+      ECSAMI: 'ami-0fcfb0266308303f6'
     'sa-east-1':
-      ECSAMI: 'ami-027961ea9f99b94b8'
-    'ca-central-1':
-      ECSAMI: 'ami-0720b74139c459b83'
+      ECSAMI: 'ami-0f8f84c4a3c9e1ed3'
     'ap-east-1':
-      ECSAMI: 'ami-0ac9d29184f2949e4'
+      ECSAMI: 'ami-0a4fbf7f8b0db42a4'
     'ap-southeast-1':
-      ECSAMI: 'ami-0996cfb3acf118b24'
+      ECSAMI: 'ami-0b91f3efad17de577'
     'ap-southeast-2':
-      ECSAMI: 'ami-0ace32fdb211c83e0'
+      ECSAMI: 'ami-016dfbb93297168e3'
     'ap-southeast-3':
-      ECSAMI: 'ami-0cf92ed4ce1523264'
-    'eu-central-1':
-      ECSAMI: 'ami-0479e02f9b310c857'
+      ECSAMI: 'ami-01f3cb07cc12e56c2'
     'us-east-1':
-      ECSAMI: 'ami-00eb90638788e810f'
+      ECSAMI: 'ami-0fe5f366c083f59ca'
     'us-east-2':
-      ECSAMI: 'ami-0b0033935e98632de'
-    'us-west-1':
-      ECSAMI: 'ami-03d937713d2d29e68'
-    'us-west-2':
-      ECSAMI: 'ami-0091142fcd273792c'
+      ECSAMI: 'ami-04474aeb33af328e7'
 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 fbba03f7d..30ecd3e26 100644
--- a/jenkins/jenkins2-ha-agents.yaml
+++ b/jenkins/jenkins2-ha-agents.yaml
@@ -218,52 +218,56 @@ Parameters:
     Default: 'cron(0 5 ? * * *)'
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
+      AMI: 'ami-00680fd4e58e51542'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
+      AMI: 'ami-09dca206ba8b0b1cc'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
+      AMI: 'ami-0b73aa7c1d1b2e901'
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
+      AMI: 'ami-0886a3d2c8b721217'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
+      AMI: 'ami-0667c5c08ef2aeddb'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
+      AMI: 'ami-0185a6f76b69a1870'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index b48b28a48..6b2b62f9e 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -166,52 +166,56 @@ Parameters:
     Default: 'cron(0 5 ? * * *)'
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
+      AMI: 'ami-00680fd4e58e51542'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
+      AMI: 'ami-09dca206ba8b0b1cc'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
+      AMI: 'ami-0b73aa7c1d1b2e901'
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
+      AMI: 'ami-0886a3d2c8b721217'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
+      AMI: 'ami-0667c5c08ef2aeddb'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
+      AMI: 'ami-0185a6f76b69a1870'
 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 684525a99..4661d4367 100644
--- a/security/auth-proxy-ha-github-orga.yaml
+++ b/security/auth-proxy-ha-github-orga.yaml
@@ -144,52 +144,56 @@ Parameters:
     MaxValue: 4000
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
+      AMI: 'ami-00680fd4e58e51542'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
+      AMI: 'ami-09dca206ba8b0b1cc'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
+      AMI: 'ami-0b73aa7c1d1b2e901'
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
+      AMI: 'ami-0886a3d2c8b721217'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
+      AMI: 'ami-0667c5c08ef2aeddb'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
+      AMI: 'ami-0185a6f76b69a1870'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/README.md b/vpc/README.md
index 23c7dbfe8..541d4079a 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.20220907.3-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.20221018.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 8fecf495e..9baa34392 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -98,52 +98,56 @@ Parameters:
     Default: ''
 Mappings:
   RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
+    'ap-south-1':
+      NATAMI: 'ami-0df7666848843e33c'
+    'eu-south-1':
+      NATAMI: 'ami-0b6e747b44ed18d2d'
+    'eu-south-2':
+      NATAMI: 'ami-06b160ec246261a31'
+    'me-central-1':
+      NATAMI: 'ami-0b05a9ad3cdef627e'
+    'ca-central-1':
+      NATAMI: 'ami-03cde0712fd4682b5'
+    'eu-central-1':
+      NATAMI: 'ami-0c3b2f7a7308f788a'
+    'eu-central-2':
+      NATAMI: 'ami-0fa6381553e6bfa52'
+    'us-west-1':
+      NATAMI: 'ami-0a324f9c6da576156'
+    'us-west-2':
+      NATAMI: 'ami-0f95da1ca59f7dea0'
     'af-south-1':
-      NATAMI: 'ami-0d8173c9560d1db23'
+      NATAMI: 'ami-07bef6391d2e3b08e'
     'eu-north-1':
-      NATAMI: 'ami-099dda2264bf52ca7'
-    'ap-south-1':
-      NATAMI: 'ami-0fe932cb431f5e326'
+      NATAMI: 'ami-030d81bd325b71fb7'
     'eu-west-3':
-      NATAMI: 'ami-0d7c7fe775a76686f'
+      NATAMI: 'ami-0461d8f4c4968b7ec'
     'eu-west-2':
-      NATAMI: 'ami-05b9ce74a38f33649'
-    'eu-south-1':
-      NATAMI: 'ami-004b73ef2def09cae'
+      NATAMI: 'ami-0e15466c9418941de'
     'eu-west-1':
-      NATAMI: 'ami-002d4e248602ba877'
+      NATAMI: 'ami-06526e76ad313da09'
     'ap-northeast-3':
-      NATAMI: 'ami-0ce80f38c7b494641'
+      NATAMI: 'ami-03b992d774d04bffb'
     'ap-northeast-2':
-      NATAMI: 'ami-0ddf5e27c82e49afc'
+      NATAMI: 'ami-0e7750a7f051bb3ac'
     'me-south-1':
-      NATAMI: 'ami-064327e370e249f28'
+      NATAMI: 'ami-0a1f3f72a3c48c6cd'
     'ap-northeast-1':
-      NATAMI: 'ami-08369ce44e913655c'
-    'me-central-1':
-      NATAMI: 'ami-0b8a84319f4f67d48'
+      NATAMI: 'ami-04475a950b13bd6cd'
     'sa-east-1':
-      NATAMI: 'ami-0e531a83833a1c0be'
-    'ca-central-1':
-      NATAMI: 'ami-0e1db7c672a3400fc'
+      NATAMI: 'ami-0cf5d3ef46ad5187b'
     'ap-east-1':
-      NATAMI: 'ami-0fef2b749732ab380'
+      NATAMI: 'ami-0507293d9b00ecd82'
     'ap-southeast-1':
-      NATAMI: 'ami-0b8daac939ebab0cd'
+      NATAMI: 'ami-0ee85d848c6f9be18'
     'ap-southeast-2':
-      NATAMI: 'ami-0d142f08d13879a08'
+      NATAMI: 'ami-040bd9b271fa3545f'
     'ap-southeast-3':
-      NATAMI: 'ami-02b227f6a66c3ce47'
-    'eu-central-1':
-      NATAMI: 'ami-0676d91857bf1c8e1'
+      NATAMI: 'ami-02b72f1d778f2618b'
     'us-east-1':
-      NATAMI: 'ami-01e8be21b15b706b3'
+      NATAMI: 'ami-0cc6fa590dc4d36eb'
     'us-east-2':
-      NATAMI: 'ami-0b81de1864465dcc2'
-    'us-west-1':
-      NATAMI: 'ami-033fcfcd060fd492e'
-    'us-west-2':
-      NATAMI: 'ami-08388cc24a4260acc'
+      NATAMI: 'ami-0cd306025577aa54d'
 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 3aabebbd5..b66ebfb6b 100644
--- a/vpc/vpc-ssh-bastion.yaml
+++ b/vpc/vpc-ssh-bastion.yaml
@@ -90,52 +90,56 @@ Parameters:
     Default: ''
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
+      AMI: 'ami-00680fd4e58e51542'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
+      AMI: 'ami-09dca206ba8b0b1cc'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
+      AMI: 'ami-0b73aa7c1d1b2e901'
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
+      AMI: 'ami-0886a3d2c8b721217'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
+      AMI: 'ami-0667c5c08ef2aeddb'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
+      AMI: 'ami-0185a6f76b69a1870'
 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 945187862..5c73de273 100644
--- a/vpc/vpc-vpn-bastion.yaml
+++ b/vpc/vpc-vpn-bastion.yaml
@@ -132,52 +132,56 @@ Parameters:
     Default: 'cron(0 5 ? * * *)'
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
+      AMI: 'ami-00680fd4e58e51542'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
+      AMI: 'ami-09dca206ba8b0b1cc'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
+      AMI: 'ami-0b73aa7c1d1b2e901'
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
+      AMI: 'ami-0886a3d2c8b721217'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
+      AMI: 'ami-0667c5c08ef2aeddb'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
+      AMI: 'ami-0185a6f76b69a1870'
 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 28e203f96..be0ab5710 100644
--- a/wordpress/wordpress-ha-aurora.yaml
+++ b/wordpress/wordpress-ha-aurora.yaml
@@ -190,75 +190,81 @@ Parameters:
     MaxValue: 4000
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+      PrefixListCloudFront: 'pl-9aa247f3'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+      PrefixListCloudFront: 'pl-1bbc5972'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+      PrefixListCloudFront: ''
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+      PrefixListCloudFront: ''
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+      PrefixListCloudFront: 'pl-38a64351'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+      PrefixListCloudFront: 'pl-a3a144ca'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+      PrefixListCloudFront: ''
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+      PrefixListCloudFront: 'pl-4ea04527'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
+      PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
+      AMI: 'ami-00680fd4e58e51542'
       PrefixListCloudFront: 'pl-fab65393'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
-      PrefixListCloudFront: 'pl-9aa247f3'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
+      AMI: 'ami-09dca206ba8b0b1cc'
       PrefixListCloudFront: 'pl-93a247fa'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
-      PrefixListCloudFront: 'pl-1bbc5972'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
+      AMI: 'ami-0b73aa7c1d1b2e901'
       PrefixListCloudFront: 'pl-58a04531'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
-      PrefixListCloudFront: ''
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
+      AMI: 'ami-0886a3d2c8b721217'
       PrefixListCloudFront: 'pl-5da64334'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
-      PrefixListCloudFront: 'pl-38a64351'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
+      AMI: 'ami-0667c5c08ef2aeddb'
       PrefixListCloudFront: 'pl-bca247d5'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
-      PrefixListCloudFront: 'pl-a3a144ca'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
+      AMI: 'ami-0185a6f76b69a1870'
       PrefixListCloudFront: 'pl-b6a144df'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-      PrefixListCloudFront: 'pl-4ea04527'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
-      PrefixListCloudFront: 'pl-82a045eb'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref WebServerKeyName, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index e3a18656f..e99d467b6 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -227,75 +227,81 @@ Parameters:
     MaxValue: 4000
 Mappings:
   RegionMap:
+    'ap-south-1':
+      AMI: 'ami-0a2457eba250ca23d'
+      PrefixListCloudFront: 'pl-9aa247f3'
+    'eu-south-1':
+      AMI: 'ami-0a5352278bc7c5131'
+      PrefixListCloudFront: 'pl-1bbc5972'
+    'eu-south-2':
+      AMI: 'ami-06dead0e885b328ac'
+      PrefixListCloudFront: ''
+    'me-central-1':
+      AMI: 'ami-0884cb015c5e68ba2'
+      PrefixListCloudFront: ''
+    'ca-central-1':
+      AMI: 'ami-017f4811a06d3e510'
+      PrefixListCloudFront: 'pl-38a64351'
+    'eu-central-1':
+      AMI: 'ami-034a7d2833172671e'
+      PrefixListCloudFront: 'pl-a3a144ca'
+    'eu-central-2':
+      AMI: 'ami-0ec30364fff59d57e'
+      PrefixListCloudFront: ''
+    'us-west-1':
+      AMI: 'ami-0e587da169af43ce1'
+      PrefixListCloudFront: 'pl-4ea04527'
+    'us-west-2':
+      AMI: 'ami-08e4eaf54ff5ee95e'
+      PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-06802a470d405f25b'
+      AMI: 'ami-0ad6ce76c6b363743'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0d8ac604c02b0cc17'
+      AMI: 'ami-00680fd4e58e51542'
       PrefixListCloudFront: 'pl-fab65393'
-    'ap-south-1':
-      AMI: 'ami-01f703c132f2b1a20'
-      PrefixListCloudFront: 'pl-9aa247f3'
     'eu-west-3':
-      AMI: 'ami-0a53f4992623d6f03'
+      AMI: 'ami-03c2abbbe8af9a7e6'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-060c0d1361bbd1bd7'
+      AMI: 'ami-09dca206ba8b0b1cc'
       PrefixListCloudFront: 'pl-93a247fa'
-    'eu-south-1':
-      AMI: 'ami-04d9b6c3245fb8f5d'
-      PrefixListCloudFront: 'pl-1bbc5972'
     'eu-west-1':
-      AMI: 'ami-0dcc20d3a15abf9bb'
+      AMI: 'ami-09958e8db3b1f3210'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0d92f0fcc82f45f80'
+      AMI: 'ami-0ca7f72edb2808742'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-07810a490b4267374'
+      AMI: 'ami-06eb68a3c20079122'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0bc65f60196533bc9'
+      AMI: 'ami-0b55279ba6eea2f77'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-046a961f907758d0d'
+      AMI: 'ami-0b73aa7c1d1b2e901'
       PrefixListCloudFront: 'pl-58a04531'
-    'me-central-1':
-      AMI: 'ami-09648061d3ac08b8f'
-      PrefixListCloudFront: ''
     'sa-east-1':
-      AMI: 'ami-02e0498e7e54ef3c9'
+      AMI: 'ami-0886a3d2c8b721217'
       PrefixListCloudFront: 'pl-5da64334'
-    'ca-central-1':
-      AMI: 'ami-05926d68079b85f1c'
-      PrefixListCloudFront: 'pl-38a64351'
     'ap-east-1':
-      AMI: 'ami-0a94039f0f5443c97'
+      AMI: 'ami-0e40d6716d6ef2aa4'
       PrefixListCloudFront: 'pl-14b2577d'
     'ap-southeast-1':
-      AMI: 'ami-0d46390da1dfb8792'
+      AMI: 'ami-009c33adf2a03baf9'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02b86aca723e9967e'
+      AMI: 'ami-08efd89f971ace76d'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-006438996c3cd85c2'
+      AMI: 'ami-0667c5c08ef2aeddb'
       PrefixListCloudFront: 'pl-bca247d5'
-    'eu-central-1':
-      AMI: 'ami-0b920b0594b5288fb'
-      PrefixListCloudFront: 'pl-a3a144ca'
     'us-east-1':
-      AMI: 'ami-0c4e4b4eb2e11d1d4'
+      AMI: 'ami-02b972fec07f1e659'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-07693758d0ebc2111'
+      AMI: 'ami-0185a6f76b69a1870'
       PrefixListCloudFront: 'pl-b6a144df'
-    'us-west-1':
-      AMI: 'ami-061352bb71c4724b2'
-      PrefixListCloudFront: 'pl-4ea04527'
-    'us-west-2':
-      AMI: 'ami-0f9f005c313373218'
-      PrefixListCloudFront: 'pl-82a045eb'
   DBServerInstanceTypeMap:
     'db.t3.micro':
       PerformanceInsights: false