diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index eb041dca5..baf761ccc 100644
--- a/ecs/cluster-cost-optimized.yaml
+++ b/ecs/cluster-cost-optimized.yaml
@@ -175,63 +175,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-0948be2e45d0c17a4'
+      ECSAMI: 'ami-07920be66ff9ab12e'
     'ap-south-1':
-      ECSAMI: 'ami-0f2f722514ec458e4'
+      ECSAMI: 'ami-0bb19f0a62c9ba776'
     'eu-south-1':
-      ECSAMI: 'ami-08f07a254236fe4c2'
+      ECSAMI: 'ami-02f0f5f7b3002130f'
     'eu-south-2':
-      ECSAMI: 'ami-05692f4c7664849d7'
+      ECSAMI: 'ami-0fce31ee76e1e94d1'
     'me-central-1':
-      ECSAMI: 'ami-092c78859d64b7624'
+      ECSAMI: 'ami-05a4d8d0aeba4f58d'
     'il-central-1':
-      ECSAMI: 'ami-08721e7c34908f653'
+      ECSAMI: 'ami-0e94997d080e26c6d'
     'ca-central-1':
-      ECSAMI: 'ami-082665e6ab8d42cb0'
+      ECSAMI: 'ami-022318621048ad442'
     'eu-central-1':
-      ECSAMI: 'ami-0029cbd17e0d653cf'
+      ECSAMI: 'ami-0c881b16b4817bb53'
     'eu-central-2':
-      ECSAMI: 'ami-05fd5537538fe20bb'
+      ECSAMI: 'ami-0cbfb1800efd37ef0'
     'us-west-1':
-      ECSAMI: 'ami-01062c16478410ae9'
+      ECSAMI: 'ami-032e68d382698e558'
     'us-west-2':
-      ECSAMI: 'ami-0d63309a12899f79d'
+      ECSAMI: 'ami-0e1c6ce4c5241cafb'
     'af-south-1':
-      ECSAMI: 'ami-0886f0df59ef0c4f5'
+      ECSAMI: 'ami-0eb6d0cf9f82fa4e8'
     'eu-north-1':
-      ECSAMI: 'ami-02884f132e016739b'
+      ECSAMI: 'ami-09f2c9ca742afdff8'
     'eu-west-3':
-      ECSAMI: 'ami-01af218f0e0585bfd'
+      ECSAMI: 'ami-03aa0d7df552b14d6'
     'eu-west-2':
-      ECSAMI: 'ami-00c2baa11ffe76dc3'
+      ECSAMI: 'ami-034e45d0fddd372d3'
     'eu-west-1':
-      ECSAMI: 'ami-02564d2c9e672ddfb'
+      ECSAMI: 'ami-06a8224da4db61217'
     'ap-northeast-3':
-      ECSAMI: 'ami-0b657ecd487b16cb4'
+      ECSAMI: 'ami-017b752a2380eac44'
     'ap-northeast-2':
-      ECSAMI: 'ami-0d11e8b0f23559e9b'
+      ECSAMI: 'ami-08c70ad061eb4c7c5'
     'me-south-1':
-      ECSAMI: 'ami-06bf01de200152c9c'
+      ECSAMI: 'ami-06d5e4f8f40be933f'
     'ap-northeast-1':
-      ECSAMI: 'ami-0dd329f1a3978a31b'
+      ECSAMI: 'ami-0cd5f7cdb91b35390'
     'sa-east-1':
-      ECSAMI: 'ami-07384481b16f0590c'
+      ECSAMI: 'ami-0acd127172a0ae9b2'
     'ap-east-1':
-      ECSAMI: 'ami-0fe54437fd1ea50da'
+      ECSAMI: 'ami-05d2c5db3a33b11b5'
     'ca-west-1':
-      ECSAMI: 'ami-01a019c743a281a6d'
+      ECSAMI: 'ami-06198af79075cf83a'
     'ap-southeast-1':
-      ECSAMI: 'ami-08b5c30165eacc281'
+      ECSAMI: 'ami-075d2e2f1a80495c3'
     'ap-southeast-2':
-      ECSAMI: 'ami-02852397808ce075c'
+      ECSAMI: 'ami-017fdbe5fed8fb4d4'
     'ap-southeast-3':
-      ECSAMI: 'ami-0768de4b8befd3d48'
+      ECSAMI: 'ami-00bdc34763fb93f9a'
     'ap-southeast-4':
-      ECSAMI: 'ami-02673a1d5f393d087'
+      ECSAMI: 'ami-0efdba26e26f00f1a'
     'us-east-1':
-      ECSAMI: 'ami-0c45946ade6066f3d'
+      ECSAMI: 'ami-0b789cb897e3bc975'
     'us-east-2':
-      ECSAMI: 'ami-09c0b8e7f21923ac0'
+      ECSAMI: 'ami-0d865164de9113b45'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index 5d973b1cf..3376a81a9 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -207,63 +207,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-0948be2e45d0c17a4'
+      ECSAMI: 'ami-07920be66ff9ab12e'
     'ap-south-1':
-      ECSAMI: 'ami-0f2f722514ec458e4'
+      ECSAMI: 'ami-0bb19f0a62c9ba776'
     'eu-south-1':
-      ECSAMI: 'ami-08f07a254236fe4c2'
+      ECSAMI: 'ami-02f0f5f7b3002130f'
     'eu-south-2':
-      ECSAMI: 'ami-05692f4c7664849d7'
+      ECSAMI: 'ami-0fce31ee76e1e94d1'
     'me-central-1':
-      ECSAMI: 'ami-092c78859d64b7624'
+      ECSAMI: 'ami-05a4d8d0aeba4f58d'
     'il-central-1':
-      ECSAMI: 'ami-08721e7c34908f653'
+      ECSAMI: 'ami-0e94997d080e26c6d'
     'ca-central-1':
-      ECSAMI: 'ami-082665e6ab8d42cb0'
+      ECSAMI: 'ami-022318621048ad442'
     'eu-central-1':
-      ECSAMI: 'ami-0029cbd17e0d653cf'
+      ECSAMI: 'ami-0c881b16b4817bb53'
     'eu-central-2':
-      ECSAMI: 'ami-05fd5537538fe20bb'
+      ECSAMI: 'ami-0cbfb1800efd37ef0'
     'us-west-1':
-      ECSAMI: 'ami-01062c16478410ae9'
+      ECSAMI: 'ami-032e68d382698e558'
     'us-west-2':
-      ECSAMI: 'ami-0d63309a12899f79d'
+      ECSAMI: 'ami-0e1c6ce4c5241cafb'
     'af-south-1':
-      ECSAMI: 'ami-0886f0df59ef0c4f5'
+      ECSAMI: 'ami-0eb6d0cf9f82fa4e8'
     'eu-north-1':
-      ECSAMI: 'ami-02884f132e016739b'
+      ECSAMI: 'ami-09f2c9ca742afdff8'
     'eu-west-3':
-      ECSAMI: 'ami-01af218f0e0585bfd'
+      ECSAMI: 'ami-03aa0d7df552b14d6'
     'eu-west-2':
-      ECSAMI: 'ami-00c2baa11ffe76dc3'
+      ECSAMI: 'ami-034e45d0fddd372d3'
     'eu-west-1':
-      ECSAMI: 'ami-02564d2c9e672ddfb'
+      ECSAMI: 'ami-06a8224da4db61217'
     'ap-northeast-3':
-      ECSAMI: 'ami-0b657ecd487b16cb4'
+      ECSAMI: 'ami-017b752a2380eac44'
     'ap-northeast-2':
-      ECSAMI: 'ami-0d11e8b0f23559e9b'
+      ECSAMI: 'ami-08c70ad061eb4c7c5'
     'me-south-1':
-      ECSAMI: 'ami-06bf01de200152c9c'
+      ECSAMI: 'ami-06d5e4f8f40be933f'
     'ap-northeast-1':
-      ECSAMI: 'ami-0dd329f1a3978a31b'
+      ECSAMI: 'ami-0cd5f7cdb91b35390'
     'sa-east-1':
-      ECSAMI: 'ami-07384481b16f0590c'
+      ECSAMI: 'ami-0acd127172a0ae9b2'
     'ap-east-1':
-      ECSAMI: 'ami-0fe54437fd1ea50da'
+      ECSAMI: 'ami-05d2c5db3a33b11b5'
     'ca-west-1':
-      ECSAMI: 'ami-01a019c743a281a6d'
+      ECSAMI: 'ami-06198af79075cf83a'
     'ap-southeast-1':
-      ECSAMI: 'ami-08b5c30165eacc281'
+      ECSAMI: 'ami-075d2e2f1a80495c3'
     'ap-southeast-2':
-      ECSAMI: 'ami-02852397808ce075c'
+      ECSAMI: 'ami-017fdbe5fed8fb4d4'
     'ap-southeast-3':
-      ECSAMI: 'ami-0768de4b8befd3d48'
+      ECSAMI: 'ami-00bdc34763fb93f9a'
     'ap-southeast-4':
-      ECSAMI: 'ami-02673a1d5f393d087'
+      ECSAMI: 'ami-0efdba26e26f00f1a'
     'us-east-1':
-      ECSAMI: 'ami-0c45946ade6066f3d'
+      ECSAMI: 'ami-0b789cb897e3bc975'
     'us-east-2':
-      ECSAMI: 'ami-09c0b8e7f21923ac0'
+      ECSAMI: 'ami-0d865164de9113b45'
 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 af46555ba..62847b44a 100644
--- a/jenkins/jenkins2-ha-agents.yaml
+++ b/jenkins/jenkins2-ha-agents.yaml
@@ -219,63 +219,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index bdea8b5a6..2cd194121 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -167,63 +167,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
 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 cba44f780..bd8f760f7 100644
--- a/security/auth-proxy-ha-github-orga.yaml
+++ b/security/auth-proxy-ha-github-orga.yaml
@@ -145,63 +145,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/vpc-nat-instance.yaml b/vpc/vpc-nat-instance.yaml
index c81bb36e3..9b8fbfcef 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -143,7 +143,7 @@ Mappings:
     'ap-east-1':
       NATAMI: 'ami-0ae191faab512a3be'
     'ca-west-1':
-      NATAMI: 'not-yet-available'
+      NATAMI: 'None'
     'ap-southeast-1':
       NATAMI: 'ami-07f6e75d70600a05e'
     'ap-southeast-2':
diff --git a/vpc/vpc-ssh-bastion.yaml b/vpc/vpc-ssh-bastion.yaml
index 4db1de7f6..32a471f80 100644
--- a/vpc/vpc-ssh-bastion.yaml
+++ b/vpc/vpc-ssh-bastion.yaml
@@ -91,63 +91,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
 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 973560198..5a01354ba 100644
--- a/vpc/vpc-vpn-bastion.yaml
+++ b/vpc/vpc-vpn-bastion.yaml
@@ -133,63 +133,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
 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 a03c9c721..ff4d73337 100644
--- a/wordpress/wordpress-ha-aurora.yaml
+++ b/wordpress/wordpress-ha-aurora.yaml
@@ -191,91 +191,91 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
       PrefixListCloudFront: 'pl-0a25c3463226fcc61'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
       PrefixListCloudFront: 'pl-052dcbe0f793f19da'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
       PrefixListCloudFront: 'pl-05266a86378662c23'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
       PrefixListCloudFront: 'pl-0dd89524416301988'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
       PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
       PrefixListCloudFront: 'pl-14b2577d'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
       PrefixListCloudFront: 'pl-0530d4c590b35122b'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
       PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
       PrefixListCloudFront: 'pl-b6a144df'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index 92b97c165..aff754b5d 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -228,91 +228,91 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0fd07010d91ec94ed'
+      AMI: 'ami-0ab51832ad0357955'
       PrefixListCloudFront: 'pl-0a25c3463226fcc61'
     'ap-south-1':
-      AMI: 'ami-0501e3547293b2db3'
+      AMI: 'ami-0d6eab68a2aa4419b'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-064e641df9c88db1a'
+      AMI: 'ami-0c17f1490200f1b98'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-03e38c7ccbe876512'
+      AMI: 'ami-0a8f09e218768d19d'
       PrefixListCloudFront: 'pl-052dcbe0f793f19da'
     'me-central-1':
-      AMI: 'ami-098c0ce6c458f300e'
+      AMI: 'ami-07e91783d8a16e1f2'
       PrefixListCloudFront: 'pl-05266a86378662c23'
     'il-central-1':
-      AMI: 'ami-06c7a65b4ba37244d'
+      AMI: 'ami-04ee358ea26a28621'
       PrefixListCloudFront: 'pl-0dd89524416301988'
     'ca-central-1':
-      AMI: 'ami-024076c81e3291472'
+      AMI: 'ami-06aa9bf8acd13295e'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-08b47394fb4c462b9'
+      AMI: 'ami-0b26dd07b92ba60b5'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-046f9d0ba1e596fe8'
+      AMI: 'ami-08b6d5c9e5f65725a'
       PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-04918638df2143901'
+      AMI: 'ami-0b301738029f9f48e'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-05c89af705fc8fb3c'
+      AMI: 'ami-076e3756930a93fbb'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-060b324aa32c23562'
+      AMI: 'ami-04c86004365f50376'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-04c9ea0e72cda507a'
+      AMI: 'ami-05668410ca8bbacb3'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-090f3b471c0bb9c7f'
+      AMI: 'ami-0e240183bb3096e67'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-018302178b8f5d0a6'
+      AMI: 'ami-08ceb58c67626d304'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-05e9a7830635fe160'
+      AMI: 'ami-064857453c447bed5'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0c3613ae50638f6c0'
+      AMI: 'ami-0806b1119517557f0'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-0819c049403b5aa6b'
+      AMI: 'ami-00252d017d66f9cdd'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-0c710a975841e684b'
+      AMI: 'ami-05263463386d9b3a5'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-022c3cb73fbed1cc7'
+      AMI: 'ami-08aa3b50f80805e20'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-037cb310a4cd89c1c'
+      AMI: 'ami-0cd4a737dad460342'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-09f4076013f7a5cad'
+      AMI: 'ami-0a97c2677505cda75'
       PrefixListCloudFront: 'pl-14b2577d'
     'ca-west-1':
-      AMI: 'ami-07ebbc212c45de49d'
+      AMI: 'ami-01c7593ec24183809'
       PrefixListCloudFront: 'pl-0530d4c590b35122b'
     'ap-southeast-1':
-      AMI: 'ami-03d7c57e0f49d78d2'
+      AMI: 'ami-083068d1edaf8af18'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-02d628788b362146a'
+      AMI: 'ami-094ff1d74ab636074'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-05754d6f8b26b908c'
+      AMI: 'ami-08990191cc9b187ac'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-049fc5d0791fd7ead'
+      AMI: 'ami-0d9704c67691a5331'
       PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9'
     'us-east-1':
-      AMI: 'ami-04c0f9ef2f505b609'
+      AMI: 'ami-046eeba8a7f7bbefd'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0118c442c801c0d26'
+      AMI: 'ami-02c4f64d0cbab1731'
       PrefixListCloudFront: 'pl-b6a144df'
   DBServerInstanceTypeMap:
     'db.t3.micro':