diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6da5766..71f1389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0
+
+- updating lambda timeout to 30 seconds
+
 ## 0.1.0
 
 - initial release
diff --git a/lambda.tf b/lambda.tf
index 6423146..1cb0cc8 100644
--- a/lambda.tf
+++ b/lambda.tf
@@ -24,6 +24,7 @@ resource "aws_lambda_function" "lambda_shuffler" {
     filename = "shuffler.zip"
     role = "${aws_iam_role.lambda_shuffler_role.arn}"
     source_code_hash = "${base64sha256(file("shuffler.zip"))}"
+    timeout = 30
     environment {
       variables = {
         REGION       = "${var.region}"