From 81350520e7a84900bcffab800064286cf2170208 Mon Sep 17 00:00:00 2001
From: Michael Wittig <michael@widdix.de>
Date: Thu, 11 Jan 2024 10:36:23 +0100
Subject: [PATCH] [Security] * - Update Amazon Linux 2 / AL2 ECS / AL1 NAT
 [Improvement] * Support new region ca-west-1

---
 ec2/al2-mutable-private.yaml            | 63 ++++++++++++++++++++++++-
 ec2/al2-mutable-public.yaml             | 63 ++++++++++++++++++++++++-
 ecs/cluster-cost-optimized.yaml         | 58 ++++++++++++-----------
 ecs/cluster.yaml                        | 58 ++++++++++++-----------
 jenkins/jenkins2-ha-agents.yaml         | 58 ++++++++++++-----------
 jenkins/jenkins2-ha.yaml                | 58 ++++++++++++-----------
 security/auth-proxy-ha-github-orga.yaml | 58 ++++++++++++-----------
 vpc/README.md                           |  2 +-
 vpc/vpc-nat-instance.yaml               | 58 ++++++++++++-----------
 vpc/vpc-ssh-bastion.yaml                | 58 ++++++++++++-----------
 vpc/vpc-vpn-bastion.yaml                | 58 ++++++++++++-----------
 wordpress/wordpress-ha-aurora.yaml      | 59 ++++++++++++-----------
 wordpress/wordpress-ha.yaml             | 59 ++++++++++++-----------
 13 files changed, 427 insertions(+), 283 deletions(-)

diff --git a/ec2/al2-mutable-private.yaml b/ec2/al2-mutable-private.yaml
index d53af272a..3be591c59 100644
--- a/ec2/al2-mutable-private.yaml
+++ b/ec2/al2-mutable-private.yaml
@@ -200,9 +200,11 @@ Parameters:
   AmazonLinux2Version:
     Description: 'Version of Amazon Linux 2 to boot from the first time (ignored if RestoreImageId is set; select the latest version for new stacks; OS updates are enabled to patch the system).'
     Type: String
-    AllowedValues: ['20230727.0', '20220316.0', '20220218.3', '20220218.1', '20220207.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
+    AllowedValues: ['20240109.0', '20230727.0', '20220316.0', '20220218.3', '20220218.1', '20220207.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
 Mappings:
   VersionMap:
+    '20240109.0':
+      Map: RegionMap202401090
     '20230727.0':
       Map: RegionMap202307270
     '20220316.0':
@@ -237,6 +239,65 @@ Mappings:
       Map: RegionMap202002071
     '20191217.0':
       Map: RegionMap201912170
+  RegionMap202401090:
+    'ap-south-2':
+      AMI: 'ami-0fd07010d91ec94ed'
+    'ap-south-1':
+      AMI: 'ami-0501e3547293b2db3'
+    'eu-south-1':
+      AMI: 'ami-064e641df9c88db1a'
+    'eu-south-2':
+      AMI: 'ami-03e38c7ccbe876512'
+    'me-central-1':
+      AMI: 'ami-098c0ce6c458f300e'
+    'il-central-1':
+      AMI: 'ami-06c7a65b4ba37244d'
+    'ca-central-1':
+      AMI: 'ami-024076c81e3291472'
+    'eu-central-1':
+      AMI: 'ami-08b47394fb4c462b9'
+    'eu-central-2':
+      AMI: 'ami-046f9d0ba1e596fe8'
+    'us-west-1':
+      AMI: 'ami-04918638df2143901'
+    'us-west-2':
+      AMI: 'ami-05c89af705fc8fb3c'
+    'af-south-1':
+      AMI: 'ami-060b324aa32c23562'
+    'eu-north-1':
+      AMI: 'ami-04c9ea0e72cda507a'
+    'eu-west-3':
+      AMI: 'ami-090f3b471c0bb9c7f'
+    'eu-west-2':
+      AMI: 'ami-018302178b8f5d0a6'
+    'eu-west-1':
+      AMI: 'ami-05e9a7830635fe160'
+    'ap-northeast-3':
+      AMI: 'ami-0c3613ae50638f6c0'
+    'ap-northeast-2':
+      AMI: 'ami-0819c049403b5aa6b'
+    'me-south-1':
+      AMI: 'ami-0c710a975841e684b'
+    'ap-northeast-1':
+      AMI: 'ami-022c3cb73fbed1cc7'
+    'sa-east-1':
+      AMI: 'ami-037cb310a4cd89c1c'
+    'ap-east-1':
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
+    'ap-southeast-1':
+      AMI: 'ami-03d7c57e0f49d78d2'
+    'ap-southeast-2':
+      AMI: 'ami-02d628788b362146a'
+    'ap-southeast-3':
+      AMI: 'ami-05754d6f8b26b908c'
+    'ap-southeast-4':
+      AMI: 'ami-049fc5d0791fd7ead'
+    'us-east-1':
+      AMI: 'ami-04c0f9ef2f505b609'
+    'us-east-2':
+      AMI: 'ami-0118c442c801c0d26'
   RegionMap202307270:
     'ap-south-2':
       AMI: 'ami-04f8325a87d5f48aa'
diff --git a/ec2/al2-mutable-public.yaml b/ec2/al2-mutable-public.yaml
index 310fafcff..ab1e5b376 100644
--- a/ec2/al2-mutable-public.yaml
+++ b/ec2/al2-mutable-public.yaml
@@ -200,9 +200,11 @@ Parameters:
   AmazonLinux2Version:
     Description: 'Version of Amazon Linux 2 to boot from the first time (ignored if RestoreImageId is set; select the latest version for new stacks; OS updates are enabled to patch the system).'
     Type: String
-    AllowedValues: ['20230727.0', '20220316.0', '20220218.3', '20220218.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
+    AllowedValues: ['20240109.0', '20230727.0', '20220316.0', '20220218.3', '20220218.1', '20211223.0', '20211005.0', '20210721.2', '20210617.0', '20210126.0', '20200917.0', '20200722.0', '20200520.1', '20200406.0', '20200304.0', '20200207.1', '20191217.0']
 Mappings:
   VersionMap:
+    '20240109.0':
+      Map: RegionMap202401090
     '20230727.0':
       Map: RegionMap202307270
     '20220316.0':
@@ -237,6 +239,65 @@ Mappings:
       Map: RegionMap202002071
     '20191217.0':
       Map: RegionMap201912170
+  RegionMap202401090:
+    'ap-south-2':
+      AMI: 'ami-0fd07010d91ec94ed'
+    'ap-south-1':
+      AMI: 'ami-0501e3547293b2db3'
+    'eu-south-1':
+      AMI: 'ami-064e641df9c88db1a'
+    'eu-south-2':
+      AMI: 'ami-03e38c7ccbe876512'
+    'me-central-1':
+      AMI: 'ami-098c0ce6c458f300e'
+    'il-central-1':
+      AMI: 'ami-06c7a65b4ba37244d'
+    'ca-central-1':
+      AMI: 'ami-024076c81e3291472'
+    'eu-central-1':
+      AMI: 'ami-08b47394fb4c462b9'
+    'eu-central-2':
+      AMI: 'ami-046f9d0ba1e596fe8'
+    'us-west-1':
+      AMI: 'ami-04918638df2143901'
+    'us-west-2':
+      AMI: 'ami-05c89af705fc8fb3c'
+    'af-south-1':
+      AMI: 'ami-060b324aa32c23562'
+    'eu-north-1':
+      AMI: 'ami-04c9ea0e72cda507a'
+    'eu-west-3':
+      AMI: 'ami-090f3b471c0bb9c7f'
+    'eu-west-2':
+      AMI: 'ami-018302178b8f5d0a6'
+    'eu-west-1':
+      AMI: 'ami-05e9a7830635fe160'
+    'ap-northeast-3':
+      AMI: 'ami-0c3613ae50638f6c0'
+    'ap-northeast-2':
+      AMI: 'ami-0819c049403b5aa6b'
+    'me-south-1':
+      AMI: 'ami-0c710a975841e684b'
+    'ap-northeast-1':
+      AMI: 'ami-022c3cb73fbed1cc7'
+    'sa-east-1':
+      AMI: 'ami-037cb310a4cd89c1c'
+    'ap-east-1':
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
+    'ap-southeast-1':
+      AMI: 'ami-03d7c57e0f49d78d2'
+    'ap-southeast-2':
+      AMI: 'ami-02d628788b362146a'
+    'ap-southeast-3':
+      AMI: 'ami-05754d6f8b26b908c'
+    'ap-southeast-4':
+      AMI: 'ami-049fc5d0791fd7ead'
+    'us-east-1':
+      AMI: 'ami-04c0f9ef2f505b609'
+    'us-east-2':
+      AMI: 'ami-0118c442c801c0d26'
   RegionMap202307270:
     'ap-south-2':
       AMI: 'ami-04f8325a87d5f48aa'
diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml
index d55db27e0..b8a77a2ac 100644
--- a/ecs/cluster-cost-optimized.yaml
+++ b/ecs/cluster-cost-optimized.yaml
@@ -175,61 +175,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-08668ef764bf2ebbc'
+      ECSAMI: 'ami-0948be2e45d0c17a4'
     'ap-south-1':
-      ECSAMI: 'ami-0586eea64c9dd6ca3'
+      ECSAMI: 'ami-0f2f722514ec458e4'
     'eu-south-1':
-      ECSAMI: 'ami-0079f3bbca39ec0cc'
+      ECSAMI: 'ami-08f07a254236fe4c2'
     'eu-south-2':
-      ECSAMI: 'ami-0a8545ce52368af1e'
+      ECSAMI: 'ami-05692f4c7664849d7'
     'me-central-1':
-      ECSAMI: 'ami-08123915477a50392'
+      ECSAMI: 'ami-092c78859d64b7624'
     'il-central-1':
-      ECSAMI: 'ami-02352a9512aef87cb'
+      ECSAMI: 'ami-08721e7c34908f653'
     'ca-central-1':
-      ECSAMI: 'ami-01ef45c2bd75fcb38'
+      ECSAMI: 'ami-082665e6ab8d42cb0'
     'eu-central-1':
-      ECSAMI: 'ami-0820f7619fb6773f6'
+      ECSAMI: 'ami-0029cbd17e0d653cf'
     'eu-central-2':
-      ECSAMI: 'ami-0a472a3c6a6f80485'
+      ECSAMI: 'ami-05fd5537538fe20bb'
     'us-west-1':
-      ECSAMI: 'ami-0ed6e429117ec3a13'
+      ECSAMI: 'ami-01062c16478410ae9'
     'us-west-2':
-      ECSAMI: 'ami-0f39e221f4f68e7c1'
+      ECSAMI: 'ami-0d63309a12899f79d'
     'af-south-1':
-      ECSAMI: 'ami-02a3cfc7723f579d8'
+      ECSAMI: 'ami-0886f0df59ef0c4f5'
     'eu-north-1':
-      ECSAMI: 'ami-06f5db00a42f422a3'
+      ECSAMI: 'ami-02884f132e016739b'
     'eu-west-3':
-      ECSAMI: 'ami-06880878792955a5f'
+      ECSAMI: 'ami-01af218f0e0585bfd'
     'eu-west-2':
-      ECSAMI: 'ami-0f00dba97478c0a02'
+      ECSAMI: 'ami-00c2baa11ffe76dc3'
     'eu-west-1':
-      ECSAMI: 'ami-04f05916fc55c1daf'
+      ECSAMI: 'ami-02564d2c9e672ddfb'
     'ap-northeast-3':
-      ECSAMI: 'ami-0c0f3a32fb3be2235'
+      ECSAMI: 'ami-0b657ecd487b16cb4'
     'ap-northeast-2':
-      ECSAMI: 'ami-012640b03f45cf244'
+      ECSAMI: 'ami-0d11e8b0f23559e9b'
     'me-south-1':
-      ECSAMI: 'ami-068bd8adfcc2509b2'
+      ECSAMI: 'ami-06bf01de200152c9c'
     'ap-northeast-1':
-      ECSAMI: 'ami-0c1122aba4476525d'
+      ECSAMI: 'ami-0dd329f1a3978a31b'
     'sa-east-1':
-      ECSAMI: 'ami-09bc9be65d08def91'
+      ECSAMI: 'ami-07384481b16f0590c'
     'ap-east-1':
-      ECSAMI: 'ami-041384700bf8405c5'
+      ECSAMI: 'ami-0fe54437fd1ea50da'
+    'ca-west-1':
+      ECSAMI: 'ami-01a019c743a281a6d'
     'ap-southeast-1':
-      ECSAMI: 'ami-02fb0f1de730927d3'
+      ECSAMI: 'ami-08b5c30165eacc281'
     'ap-southeast-2':
-      ECSAMI: 'ami-0b1fafc145aae4126'
+      ECSAMI: 'ami-02852397808ce075c'
     'ap-southeast-3':
-      ECSAMI: 'ami-0968d20d7071b6b89'
+      ECSAMI: 'ami-0768de4b8befd3d48'
     'ap-southeast-4':
-      ECSAMI: 'ami-0b40bf803f00a049a'
+      ECSAMI: 'ami-02673a1d5f393d087'
     'us-east-1':
-      ECSAMI: 'ami-020ce7b4a10644f12'
+      ECSAMI: 'ami-0c45946ade6066f3d'
     'us-east-2':
-      ECSAMI: 'ami-05dbfdb618ab8261c'
+      ECSAMI: 'ami-09c0b8e7f21923ac0'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml
index dde81ad61..abeeed05c 100644
--- a/ecs/cluster.yaml
+++ b/ecs/cluster.yaml
@@ -207,61 +207,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      ECSAMI: 'ami-08668ef764bf2ebbc'
+      ECSAMI: 'ami-0948be2e45d0c17a4'
     'ap-south-1':
-      ECSAMI: 'ami-0586eea64c9dd6ca3'
+      ECSAMI: 'ami-0f2f722514ec458e4'
     'eu-south-1':
-      ECSAMI: 'ami-0079f3bbca39ec0cc'
+      ECSAMI: 'ami-08f07a254236fe4c2'
     'eu-south-2':
-      ECSAMI: 'ami-0a8545ce52368af1e'
+      ECSAMI: 'ami-05692f4c7664849d7'
     'me-central-1':
-      ECSAMI: 'ami-08123915477a50392'
+      ECSAMI: 'ami-092c78859d64b7624'
     'il-central-1':
-      ECSAMI: 'ami-02352a9512aef87cb'
+      ECSAMI: 'ami-08721e7c34908f653'
     'ca-central-1':
-      ECSAMI: 'ami-01ef45c2bd75fcb38'
+      ECSAMI: 'ami-082665e6ab8d42cb0'
     'eu-central-1':
-      ECSAMI: 'ami-0820f7619fb6773f6'
+      ECSAMI: 'ami-0029cbd17e0d653cf'
     'eu-central-2':
-      ECSAMI: 'ami-0a472a3c6a6f80485'
+      ECSAMI: 'ami-05fd5537538fe20bb'
     'us-west-1':
-      ECSAMI: 'ami-0ed6e429117ec3a13'
+      ECSAMI: 'ami-01062c16478410ae9'
     'us-west-2':
-      ECSAMI: 'ami-0f39e221f4f68e7c1'
+      ECSAMI: 'ami-0d63309a12899f79d'
     'af-south-1':
-      ECSAMI: 'ami-02a3cfc7723f579d8'
+      ECSAMI: 'ami-0886f0df59ef0c4f5'
     'eu-north-1':
-      ECSAMI: 'ami-06f5db00a42f422a3'
+      ECSAMI: 'ami-02884f132e016739b'
     'eu-west-3':
-      ECSAMI: 'ami-06880878792955a5f'
+      ECSAMI: 'ami-01af218f0e0585bfd'
     'eu-west-2':
-      ECSAMI: 'ami-0f00dba97478c0a02'
+      ECSAMI: 'ami-00c2baa11ffe76dc3'
     'eu-west-1':
-      ECSAMI: 'ami-04f05916fc55c1daf'
+      ECSAMI: 'ami-02564d2c9e672ddfb'
     'ap-northeast-3':
-      ECSAMI: 'ami-0c0f3a32fb3be2235'
+      ECSAMI: 'ami-0b657ecd487b16cb4'
     'ap-northeast-2':
-      ECSAMI: 'ami-012640b03f45cf244'
+      ECSAMI: 'ami-0d11e8b0f23559e9b'
     'me-south-1':
-      ECSAMI: 'ami-068bd8adfcc2509b2'
+      ECSAMI: 'ami-06bf01de200152c9c'
     'ap-northeast-1':
-      ECSAMI: 'ami-0c1122aba4476525d'
+      ECSAMI: 'ami-0dd329f1a3978a31b'
     'sa-east-1':
-      ECSAMI: 'ami-09bc9be65d08def91'
+      ECSAMI: 'ami-07384481b16f0590c'
     'ap-east-1':
-      ECSAMI: 'ami-041384700bf8405c5'
+      ECSAMI: 'ami-0fe54437fd1ea50da'
+    'ca-west-1':
+      ECSAMI: 'ami-01a019c743a281a6d'
     'ap-southeast-1':
-      ECSAMI: 'ami-02fb0f1de730927d3'
+      ECSAMI: 'ami-08b5c30165eacc281'
     'ap-southeast-2':
-      ECSAMI: 'ami-0b1fafc145aae4126'
+      ECSAMI: 'ami-02852397808ce075c'
     'ap-southeast-3':
-      ECSAMI: 'ami-0968d20d7071b6b89'
+      ECSAMI: 'ami-0768de4b8befd3d48'
     'ap-southeast-4':
-      ECSAMI: 'ami-0b40bf803f00a049a'
+      ECSAMI: 'ami-02673a1d5f393d087'
     'us-east-1':
-      ECSAMI: 'ami-020ce7b4a10644f12'
+      ECSAMI: 'ami-0c45946ade6066f3d'
     'us-east-2':
-      ECSAMI: 'ami-05dbfdb618ab8261c'
+      ECSAMI: 'ami-09c0b8e7f21923ac0'
 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 86bee3ac8..33f1208e4 100644
--- a/jenkins/jenkins2-ha-agents.yaml
+++ b/jenkins/jenkins2-ha-agents.yaml
@@ -219,61 +219,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
index ef6a5645a..be7489fdc 100644
--- a/jenkins/jenkins2-ha.yaml
+++ b/jenkins/jenkins2-ha.yaml
@@ -167,61 +167,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
 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 0b4e0bd81..cba44f780 100644
--- a/security/auth-proxy-ha-github-orga.yaml
+++ b/security/auth-proxy-ha-github-orga.yaml
@@ -145,61 +145,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
   HasKeyName: !Not [!Equals [!Ref KeyName, '']]
diff --git a/vpc/README.md b/vpc/README.md
index 123c24429..47858d7bd 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.20231206.1-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n  NATAMI: '$ami'\n"; done
+for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output text); do ami=$(aws --region $region ec2 describe-images --filters 'Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20231218.0-x86_64-ebs' --include-deprecated --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 6894cac80..c81bb36e3 100644
--- a/vpc/vpc-nat-instance.yaml
+++ b/vpc/vpc-nat-instance.yaml
@@ -99,61 +99,63 @@ Parameters:
 Mappings:
   RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well)
     'ap-south-2':
-      NATAMI: 'ami-0e10efc2b2c3682de'
+      NATAMI: 'ami-0472d791ba5d1201f'
     'ap-south-1':
-      NATAMI: 'ami-0fa7f69779c074828'
+      NATAMI: 'ami-090f456f6894a37a3'
     'eu-south-1':
-      NATAMI: 'ami-069e7b9422025f269'
+      NATAMI: 'ami-0ff319eab45db51d2'
     'eu-south-2':
-      NATAMI: 'ami-09ebbaeecd749d438'
+      NATAMI: 'ami-03aacc8f0410b2118'
     'me-central-1':
-      NATAMI: 'ami-02bb49e7defa1c38b'
+      NATAMI: 'ami-05446b1776a591426'
     'il-central-1':
-      NATAMI: 'ami-0cf6a4dc44bbda7d6'
+      NATAMI: 'ami-04284101370bbb0b0'
     'ca-central-1':
-      NATAMI: 'ami-031190f8f63e93c76'
+      NATAMI: 'ami-0d1d8d7162dc7bfb8'
     'eu-central-1':
-      NATAMI: 'ami-05325238a812b4dd8'
+      NATAMI: 'ami-0e593d832abf3cc7c'
     'eu-central-2':
-      NATAMI: 'ami-0030a5162067769b8'
+      NATAMI: 'ami-06975436a51eae61a'
     'us-west-1':
-      NATAMI: 'ami-09db525225865db36'
+      NATAMI: 'ami-074458a7c9ed085d8'
     'us-west-2':
-      NATAMI: 'ami-0c4096acda55e9269'
+      NATAMI: 'ami-0360f836d4db54693'
     'af-south-1':
-      NATAMI: 'ami-06f223837f3047c74'
+      NATAMI: 'ami-02027083c41f384fa'
     'eu-north-1':
-      NATAMI: 'ami-0164c79518cd421c6'
+      NATAMI: 'ami-064698d2c0eca687a'
     'eu-west-3':
-      NATAMI: 'ami-047bb3b80b3d25706'
+      NATAMI: 'ami-0550aa5880794a3e2'
     'eu-west-2':
-      NATAMI: 'ami-07b9f358e9c685d3c'
+      NATAMI: 'ami-0a762c785201359f7'
     'eu-west-1':
-      NATAMI: 'ami-0faea62cbad5bf871'
+      NATAMI: 'ami-07046d9866d7003f2'
     'ap-northeast-3':
-      NATAMI: 'ami-0af32494743ab9af9'
+      NATAMI: 'ami-01e99f787e1b4728a'
     'ap-northeast-2':
-      NATAMI: 'ami-0fce4c5a6a92c1ef1'
+      NATAMI: 'ami-08a9a8a92dd209fd6'
     'me-south-1':
-      NATAMI: 'ami-005816e9e37fd8c81'
+      NATAMI: 'ami-0d6a756d4eae0a566'
     'ap-northeast-1':
-      NATAMI: 'ami-0864de0db1b0460ec'
+      NATAMI: 'ami-0fd36ed0b548fc13c'
     'sa-east-1':
-      NATAMI: 'ami-05a60566486db7c03'
+      NATAMI: 'ami-0f84a3a2a079ad4e1'
     'ap-east-1':
-      NATAMI: 'ami-057f38260c72a1226'
+      NATAMI: 'ami-0ae191faab512a3be'
+    'ca-west-1':
+      NATAMI: 'not-yet-available'
     'ap-southeast-1':
-      NATAMI: 'ami-00e9fb9ab4d120274'
+      NATAMI: 'ami-07f6e75d70600a05e'
     'ap-southeast-2':
-      NATAMI: 'ami-01ae290a4ffaded56'
+      NATAMI: 'ami-0328940a332ac6c60'
     'ap-southeast-3':
-      NATAMI: 'ami-0e82359b9849cdfda'
+      NATAMI: 'ami-0b9a0234a712e9a81'
     'ap-southeast-4':
-      NATAMI: 'ami-0ba8b6dd21f3df722'
+      NATAMI: 'ami-04336e41746274e95'
     'us-east-1':
-      NATAMI: 'ami-07563f09317d267d7'
+      NATAMI: 'ami-08138fe6bc6cecb00'
     'us-east-2':
-      NATAMI: 'ami-0661d339044aec525'
+      NATAMI: 'ami-0434bb185ed573e92'
 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 2531c05cf..4db1de7f6 100644
--- a/vpc/vpc-ssh-bastion.yaml
+++ b/vpc/vpc-ssh-bastion.yaml
@@ -91,61 +91,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
 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 752df23d7..973560198 100644
--- a/vpc/vpc-vpn-bastion.yaml
+++ b/vpc/vpc-vpn-bastion.yaml
@@ -133,61 +133,63 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
 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 44667fc47..6d189d740 100644
--- a/wordpress/wordpress-ha-aurora.yaml
+++ b/wordpress/wordpress-ha-aurora.yaml
@@ -191,88 +191,91 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
       PrefixListCloudFront: 'pl-0a25c3463226fcc61'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
       PrefixListCloudFront: 'pl-052dcbe0f793f19da'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
       PrefixListCloudFront: 'pl-05266a86378662c23'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
       PrefixListCloudFront: 'pl-0dd89524416301988'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
       PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
       PrefixListCloudFront: 'pl-14b2577d'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
+      PrefixListCloudFront: 'pl-0530d4c590b35122b'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
       PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
       PrefixListCloudFront: 'pl-b6a144df'
 Conditions:
   HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']]
diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
index dc5448b01..e9e3e2c94 100644
--- a/wordpress/wordpress-ha.yaml
+++ b/wordpress/wordpress-ha.yaml
@@ -228,88 +228,91 @@ Parameters:
 Mappings:
   RegionMap:
     'ap-south-2':
-      AMI: 'ami-0883c6edeaba0c232'
+      AMI: 'ami-0fd07010d91ec94ed'
       PrefixListCloudFront: 'pl-0a25c3463226fcc61'
     'ap-south-1':
-      AMI: 'ami-005a9cc20490dcb20'
+      AMI: 'ami-0501e3547293b2db3'
       PrefixListCloudFront: 'pl-9aa247f3'
     'eu-south-1':
-      AMI: 'ami-0979e96ab58c5bf6c'
+      AMI: 'ami-064e641df9c88db1a'
       PrefixListCloudFront: 'pl-1bbc5972'
     'eu-south-2':
-      AMI: 'ami-0d28e7f1e398b4333'
+      AMI: 'ami-03e38c7ccbe876512'
       PrefixListCloudFront: 'pl-052dcbe0f793f19da'
     'me-central-1':
-      AMI: 'ami-06d5e470789dd1756'
+      AMI: 'ami-098c0ce6c458f300e'
       PrefixListCloudFront: 'pl-05266a86378662c23'
     'il-central-1':
-      AMI: 'ami-0494af8133f8b2a3c'
+      AMI: 'ami-06c7a65b4ba37244d'
       PrefixListCloudFront: 'pl-0dd89524416301988'
     'ca-central-1':
-      AMI: 'ami-05c0def17123479ff'
+      AMI: 'ami-024076c81e3291472'
       PrefixListCloudFront: 'pl-38a64351'
     'eu-central-1':
-      AMI: 'ami-0a81bfd37d47e5b35'
+      AMI: 'ami-08b47394fb4c462b9'
       PrefixListCloudFront: 'pl-a3a144ca'
     'eu-central-2':
-      AMI: 'ami-0758d2c7c374d64fa'
+      AMI: 'ami-046f9d0ba1e596fe8'
       PrefixListCloudFront: 'pl-00b37293991dbe6a8'
     'us-west-1':
-      AMI: 'ami-0967795d5c824c5da'
+      AMI: 'ami-04918638df2143901'
       PrefixListCloudFront: 'pl-4ea04527'
     'us-west-2':
-      AMI: 'ami-06324ac42ce758be2'
+      AMI: 'ami-05c89af705fc8fb3c'
       PrefixListCloudFront: 'pl-82a045eb'
     'af-south-1':
-      AMI: 'ami-07502ff4e77bfb8bc'
+      AMI: 'ami-060b324aa32c23562'
       PrefixListCloudFront: 'pl-c0aa4fa9'
     'eu-north-1':
-      AMI: 'ami-0aff7a28b86fb0ae0'
+      AMI: 'ami-04c9ea0e72cda507a'
       PrefixListCloudFront: 'pl-fab65393'
     'eu-west-3':
-      AMI: 'ami-026de17499004875c'
+      AMI: 'ami-090f3b471c0bb9c7f'
       PrefixListCloudFront: 'pl-75b1541c'
     'eu-west-2':
-      AMI: 'ami-090c59e6c2011c0f9'
+      AMI: 'ami-018302178b8f5d0a6'
       PrefixListCloudFront: 'pl-93a247fa'
     'eu-west-1':
-      AMI: 'ami-0ab9466f2d8de4a40'
+      AMI: 'ami-05e9a7830635fe160'
       PrefixListCloudFront: 'pl-4fa04526'
     'ap-northeast-3':
-      AMI: 'ami-0cbcb141c440c74cf'
+      AMI: 'ami-0c3613ae50638f6c0'
       PrefixListCloudFront: 'pl-31a14458'
     'ap-northeast-2':
-      AMI: 'ami-06fd732423a0fa156'
+      AMI: 'ami-0819c049403b5aa6b'
       PrefixListCloudFront: 'pl-22a6434b'
     'me-south-1':
-      AMI: 'ami-089dcc23d7244fe4f'
+      AMI: 'ami-0c710a975841e684b'
       PrefixListCloudFront: 'pl-17b2577e'
     'ap-northeast-1':
-      AMI: 'ami-06e42143a8531727c'
+      AMI: 'ami-022c3cb73fbed1cc7'
       PrefixListCloudFront: 'pl-58a04531'
     'sa-east-1':
-      AMI: 'ami-08d6df5d2dcd8eda8'
+      AMI: 'ami-037cb310a4cd89c1c'
       PrefixListCloudFront: 'pl-5da64334'
     'ap-east-1':
-      AMI: 'ami-086181972b0e1a59f'
+      AMI: 'ami-09f4076013f7a5cad'
       PrefixListCloudFront: 'pl-14b2577d'
+    'ca-west-1':
+      AMI: 'ami-07ebbc212c45de49d'
+      PrefixListCloudFront: 'pl-0530d4c590b35122b'
     'ap-southeast-1':
-      AMI: 'ami-0ed62be0fb8004fc6'
+      AMI: 'ami-03d7c57e0f49d78d2'
       PrefixListCloudFront: 'pl-31a34658'
     'ap-southeast-2':
-      AMI: 'ami-05ec736908d346eb1'
+      AMI: 'ami-02d628788b362146a'
       PrefixListCloudFront: 'pl-b8a742d1'
     'ap-southeast-3':
-      AMI: 'ami-0feb48a0361c65aab'
+      AMI: 'ami-05754d6f8b26b908c'
       PrefixListCloudFront: 'pl-bca247d5'
     'ap-southeast-4':
-      AMI: 'ami-0eb3484588d28ff99'
+      AMI: 'ami-049fc5d0791fd7ead'
       PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9'
     'us-east-1':
-      AMI: 'ami-05034109c18473f00'
+      AMI: 'ami-04c0f9ef2f505b609'
       PrefixListCloudFront: 'pl-3b927c52'
     'us-east-2':
-      AMI: 'ami-0bc75de602edc8f79'
+      AMI: 'ami-0118c442c801c0d26'
       PrefixListCloudFront: 'pl-b6a144df'
   DBServerInstanceTypeMap:
     'db.t3.micro':