diff --git a/templates/cognito-user-pool.template b/templates/cognito-user-pool.template
index adcb25e..08ba619 100644
--- a/templates/cognito-user-pool.template
+++ b/templates/cognito-user-pool.template
@@ -50,7 +50,7 @@ Resources:
     Properties: 
       Handler: index.handler
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.6
+      Runtime: python3.9
       Timeout: 60
       Code: 
         ZipFile: |
diff --git a/templates/lambda-at-edge.template b/templates/lambda-at-edge.template
index 8020693..5554757 100644
--- a/templates/lambda-at-edge.template
+++ b/templates/lambda-at-edge.template
@@ -55,7 +55,7 @@ Resources:
     Properties: 
       Handler: index.handler
       Role: !GetAtt UpdateConfigExecutionRole.Arn
-      Runtime: python3.6
+      Runtime: python3.9
       Timeout: 60
       MemorySize: 1536
       Code: 
@@ -175,7 +175,7 @@ Resources:
     Properties: 
       Handler: index.handler
       Role: !GetAtt EdgeAuthExecutionRole.Arn
-      Runtime: nodejs14.x
+      Runtime: nodejs16.x
       Timeout: 1
       MemorySize: 128
       Code:
diff --git a/templates/populate-s3-bucket.template b/templates/populate-s3-bucket.template
index a00d2f5..656f533 100644
--- a/templates/populate-s3-bucket.template
+++ b/templates/populate-s3-bucket.template
@@ -67,7 +67,7 @@ Resources:
     Properties: 
       Handler: index.handler
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.6
+      Runtime: python3.9
       Timeout: 60
       MemorySize: 1536
       Code: 
@@ -131,7 +131,7 @@ Resources:
     Properties: 
       Handler: index.handler
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.6
+      Runtime: python3.9
       Timeout: 30
       MemorySize: 1536
       Code: