diff --git a/challenges/container_security/templates/c1cs_codepipeline.yaml b/challenges/container_security/templates/c1cs_codepipeline.yaml
index a1af1d33..267d579a 100644
--- a/challenges/container_security/templates/c1cs_codepipeline.yaml
+++ b/challenges/container_security/templates/c1cs_codepipeline.yaml
@@ -200,14 +200,13 @@ Resources:
       Source:
         Type: S3
         Location: !Sub ${QSS3BucketName}/${QSS3KeyPrefix}templates/dockerFiles.zip
-      TimeoutInMinutes: 10
     DependsOn: c1csECR
 
   lambdaFunctionStartCodeBuild:
         Type: AWS::Lambda::Function
         Properties:
           Runtime: python3.8
-          Timeout: 60
+          Timeout: 600
           Handler: index.lambda_handler
           Role: !GetAtt startCodeBuildRole.Arn
           Code:
diff --git a/challenges/container_security/templates/c1cs_get_alb_hostname.yaml b/challenges/container_security/templates/c1cs_get_alb_hostname.yaml
index 37d6dbea..f31a0363 100644
--- a/challenges/container_security/templates/c1cs_get_alb_hostname.yaml
+++ b/challenges/container_security/templates/c1cs_get_alb_hostname.yaml
@@ -51,7 +51,7 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Runtime: python3.8
-      Timeout: 60
+      Timeout: 120
       Handler: index.lambda_handler
       Role: !GetAtt c1csGetAlbHostnameRole.Arn
       Code:
diff --git a/challenges/container_security/templates/c1cs_invoke_attack_container_state_matchine.template.yaml b/challenges/container_security/templates/c1cs_invoke_attack_container_state_matchine.template.yaml
index 05d96572..fec74839 100644
--- a/challenges/container_security/templates/c1cs_invoke_attack_container_state_matchine.template.yaml
+++ b/challenges/container_security/templates/c1cs_invoke_attack_container_state_matchine.template.yaml
@@ -35,7 +35,7 @@ Resources:
       Type: AWS::Lambda::Function
       Properties:
         Runtime: python3.8
-        Timeout: 60
+        Timeout: 120
         Handler: index.lambda_handler
         Role: !GetAtt Deployc1csAttackContainerstateMachineLambdaRole.Arn
         Code:
diff --git a/challenges/file_storage_security/templates/answerValidation.template.yaml b/challenges/file_storage_security/templates/answerValidation.template.yaml
index 415c927c..0c418a22 100644
--- a/challenges/file_storage_security/templates/answerValidation.template.yaml
+++ b/challenges/file_storage_security/templates/answerValidation.template.yaml
@@ -152,7 +152,7 @@ Resources:
                   raise Exception("Payload not detected! Try again.")
 
       Role: !GetAtt PayloadCheckerLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   PayloadCheckerLambdaRole:
     Type: AWS::IAM::Role
     Properties:
@@ -327,4 +327,4 @@ Resources:
               return payload_file_present and payload_blocked and getimg_functioning_normally
                     
       Role: !GetAtt PayloadCheckerLambdaRole.Arn
-      Timeout: 30
\ No newline at end of file
+      Timeout: 60
\ No newline at end of file
diff --git a/challenges/file_storage_security/templates/attackerMachine.template.yaml b/challenges/file_storage_security/templates/attackerMachine.template.yaml
index 37918f52..864ef3ef 100644
--- a/challenges/file_storage_security/templates/attackerMachine.template.yaml
+++ b/challenges/file_storage_security/templates/attackerMachine.template.yaml
@@ -227,7 +227,7 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Runtime: python3.8
-      Timeout: 20
+      Timeout: 60
       Handler: index.lambda_handler
       Role: !GetAtt K8sAdminRole.Arn
       Code:
diff --git a/challenges/file_storage_security/templates/imageUpload.template.yaml b/challenges/file_storage_security/templates/imageUpload.template.yaml
index e04a953d..6168590d 100644
--- a/challenges/file_storage_security/templates/imageUpload.template.yaml
+++ b/challenges/file_storage_security/templates/imageUpload.template.yaml
@@ -133,7 +133,7 @@ Resources:
               return {"status": "True", "statusCode": 200, "body": "Payload delivered"}
 
       Role: !GetAtt PayloadDropperLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   PayloadDropperLambdaUrl:
     Type: AWS::Lambda::Url
     Properties: 
@@ -199,7 +199,7 @@ Resources:
         S3Bucket: !Ref CopyZipsS3Bucket
         S3Key: !Sub "${CopyZipsPrefix}${WebsiteCodeZip}" # Make sure to set S3Key like this.
       Role: !GetAtt WebsiteLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   WebsiteLambdaRole:
     Type: AWS::IAM::Role
     Properties:
@@ -311,7 +311,7 @@ Resources:
                   return {"statusCode": 404}
 
       Role: !GetAtt GetPresignedPutLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   GetPresignedPutLambdaRole:
     Type: AWS::IAM::Role
     Properties:
@@ -474,7 +474,7 @@ Resources:
                   }
 
       Role: !GetAtt GetImgLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   GetImgLambdaRole:
     Type: AWS::IAM::Role
     Properties:
@@ -606,7 +606,7 @@ Resources:
               }
 
       Role: !GetAtt ExploitCheckLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
   ExploitCheckLambdaRole:
     Type: AWS::IAM::Role
     Properties:
diff --git a/challenges/file_storage_security/templates/invokeAttackerStateMachine.template.yaml b/challenges/file_storage_security/templates/invokeAttackerStateMachine.template.yaml
index acef2b96..2a966743 100644
--- a/challenges/file_storage_security/templates/invokeAttackerStateMachine.template.yaml
+++ b/challenges/file_storage_security/templates/invokeAttackerStateMachine.template.yaml
@@ -48,7 +48,7 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Runtime: python3.8
-      Timeout: 20
+      Timeout: 60
       Handler: index.lambda_handler
       Role: !GetAtt DeployAttackerEnvStateMachineRole.Arn
       Code:
diff --git a/challenges/network_security/templates/network_security_main.template.yaml b/challenges/network_security/templates/network_security_main.template.yaml
index 31203fd7..07faf9b5 100644
--- a/challenges/network_security/templates/network_security_main.template.yaml
+++ b/challenges/network_security/templates/network_security_main.template.yaml
@@ -190,7 +190,7 @@ Resources:
       Description: "Lambda to determine if Network Security portion of the challenge is complete"
       Runtime: python3.7
       Handler: index.handler
-      Timeout: 10
+      Timeout: 60
       Role: !GetAtt LambdaScoreIAMRole.Arn
       VpcConfig:
         SubnetIds:
@@ -321,7 +321,7 @@ Resources:
       Description: "Lambda to clean up Network Security Managed Service Endpoint on completion of challenge"
       Runtime: python3.7
       Handler: index.handler
-      Timeout: 10
+      Timeout: 60
       Role: !GetAtt CleanupLambdaRole.Arn
       Code:
         ZipFile: |
diff --git a/challenges/network_security/templates/network_security_xaccountiamrole.template.yaml b/challenges/network_security/templates/network_security_xaccountiamrole.template.yaml
index 96c011d2..631fa3f4 100644
--- a/challenges/network_security/templates/network_security_xaccountiamrole.template.yaml
+++ b/challenges/network_security/templates/network_security_xaccountiamrole.template.yaml
@@ -46,7 +46,7 @@ Resources:
       Handler: "index.handler"
       Runtime: python3.9
       Role: !GetAtt BasicLambdaRole.Arn
-      Timeout: 30
+      Timeout: 60
       Code:
         ZipFile: |
           import boto3
diff --git a/challenges/onboarding/templates/c1-onboarding-service-catalog.child-template.yaml b/challenges/onboarding/templates/c1-onboarding-service-catalog.child-template.yaml
index 2f9a1c4f..6ee06108 100644
--- a/challenges/onboarding/templates/c1-onboarding-service-catalog.child-template.yaml
+++ b/challenges/onboarding/templates/c1-onboarding-service-catalog.child-template.yaml
@@ -509,7 +509,7 @@ Resources:
       Runtime: python3.8
       FunctionName: techday-cloudone-onboarding-prod-verifyC1Onboarding
       MemorySize: 256
-      Timeout: 30
+      Timeout: 60
       Description: Task 1 - Cloud One Onboarding verification module for C1onboarding-TechDay
       Tags:
         - Key: BusinessCase
diff --git a/challenges/vision_one/templates/copyzipsvousage.template.yaml b/challenges/vision_one/templates/copyzipsvousage.template.yaml
index af472c13..ca5112f4 100644
--- a/challenges/vision_one/templates/copyzipsvousage.template.yaml
+++ b/challenges/vision_one/templates/copyzipsvousage.template.yaml
@@ -33,7 +33,6 @@ Resources:
       Parameters:
         SourceBucket: !Ref QSS3BucketName
       TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/vocopyzips.template.yaml'
-      TimeoutInMinutes: 10
 
   # Run a CopyZip custom resource for the given parameters
   CopyZips:
diff --git a/templates/lockout_infra.template.yaml b/templates/lockout_infra.template.yaml
index 318c1b9c..5b148a7c 100644
--- a/templates/lockout_infra.template.yaml
+++ b/templates/lockout_infra.template.yaml
@@ -88,7 +88,7 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Description: Lambda to unlock player after break
-      Timeout: 30
+      Timeout: 60
       Handler: index.lambda_handler
       Runtime: python3.8
       Role: !GetAtt LockoutLambdaExecutionRole.Arn
diff --git a/utils/ec2keypair/ec2keypair.template.yaml b/utils/ec2keypair/ec2keypair.template.yaml
index 6fb9dfea..deb91bf3 100644
--- a/utils/ec2keypair/ec2keypair.template.yaml
+++ b/utils/ec2keypair/ec2keypair.template.yaml
@@ -62,7 +62,7 @@ Resources:
         Runtime: python3.7
         Role: !GetAtt CreateKeyPairLambdaExecutionRole.Arn
         MemorySize: 128
-        Timeout: 10
+        Timeout: 60
 
   KeyPair:
     Type: AWS::CloudFormation::CustomResource
diff --git a/utils/randomstring/randomstring.template.yaml b/utils/randomstring/randomstring.template.yaml
index 94d898ac..a54035f2 100644
--- a/utils/randomstring/randomstring.template.yaml
+++ b/utils/randomstring/randomstring.template.yaml
@@ -52,7 +52,7 @@ Resources:
       Runtime: python3.7
       Role: !GetAtt LambdaExecutionRole.Arn
       MemorySize: 128
-      Timeout: 10
+      Timeout: 60
 
  # Custom Resource 1
  SecretPassword:
diff --git a/utils/randomstring/sample-usage.template.yaml b/utils/randomstring/sample-usage.template.yaml
index 09f0bb80..9be677f2 100644
--- a/utils/randomstring/sample-usage.template.yaml
+++ b/utils/randomstring/sample-usage.template.yaml
@@ -30,7 +30,6 @@ Resources:
       Parameters:
         DestinationBucket: QSS3BucketName
       TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}utils/randomstring/randomstring.template.yaml'
-      TimeoutInMinutes: 10
 
   # Generate String
   SecretPassword: