diff --git a/cloudformationTemplates/startChatContactAPI/cloudformation.yaml b/cloudformationTemplates/startChatContactAPI/cloudformation.yaml
index c985b7c3..e6414f2a 100644
--- a/cloudformationTemplates/startChatContactAPI/cloudformation.yaml
+++ b/cloudformationTemplates/startChatContactAPI/cloudformation.yaml
@@ -50,7 +50,10 @@ Resources:
     Type: AWS::Lambda::LayerVersion
     Properties:
       CompatibleRuntimes:
-        - "nodejs18.x"
+        # Lambda Node.js runtime releases: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
+        - "nodejs22.x" # until Apr 30, 2027
+        - "nodejs20.x" # until Apr 30, 2026
+        - "nodejs18.x" # until Sep 1, 2025
         - "nodejs16.x"
       Content:
         S3Bucket: !Join
@@ -70,7 +73,8 @@ Resources:
       Description: AWS Lambda Function to initiate the chat with the end user
       Handler: "startChatContact.handler"
       Role: !GetAtt StartChatLambdaExecutionRole.Arn
-      Runtime: "nodejs18.x"
+      # Lambda Node.js runtime releases: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
+      Runtime: "nodejs22.x" # until Apr 30, 2027
       MemorySize: 128
       Timeout: 30
       Layers:
@@ -229,7 +233,8 @@ Resources:
       Handler: customResourceHelper.handler
       MemorySize: 256
       Role: !GetAtt CustomResourceHelperIamRole.Arn
-      Runtime: "nodejs18.x"
+      # Lambda Node.js runtime releases: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
+      Runtime: "nodejs22.x" # until Apr 30, 2027
       Timeout: 300
 
   CustomResourceHelperIamRole:
@@ -274,6 +279,7 @@ Resources:
   SolutionAnonymousMetric:
     Type: "Custom::LoadLambda"
     Condition: AnonymousUsageMetrics
+    DependsOn: SolutionUuid
     Properties:
       ServiceToken:
         Fn::GetAtt: