diff --git a/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf b/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
index 9965b73..ef1c07c 100644
--- a/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
+++ b/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
@@ -11,8 +11,6 @@ data "aws_ecr_repository" "extractor_and_loader" {
 # SQS queue for extractor_and_loader
 resource "aws_sqs_queue" "extractor_and_loader_queue" {
   name = "extractor-loader-queue"
-  visibility_timeout_seconds = 1800  # 30 minutes (>= 300s; ~6x rule of thumb)
-  receive_wait_time_seconds  = 20    # optional: long polling
 }
 
 
diff --git a/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf b/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
index 22f03aa..c538ac3 100644
--- a/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
+++ b/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
@@ -11,8 +11,6 @@ data "aws_ecr_repository" "walthamforest_etl_ecr" {
 # SQS queue
 resource "aws_sqs_queue" "walthamforest_etl_queue" {
   name = "walthamforest_etl-queue"
-  visibility_timeout_seconds = 1800  # 30 minutes (>= 300s; ~6x rule of thumb)
-  receive_wait_time_seconds  = 20    # optional: long polling
 }
 
 
@@ -62,7 +60,7 @@ resource "aws_lambda_function" "walthamforest_etl" {
   package_type  = "Image"
   image_uri     = "${data.aws_ecr_repository.walthamforest_etl_ecr.repository_url}:${var.lambda_image_tag}"
   # Increase timeout (max 900 sec / 15 min)
-  timeout       = 300   # e.g. 5 minutes
+  # timeout       = 300   # e.g. 5 minutes
 
   # Increase memory (default 128 MB)
   memory_size   = 2048  # try 1024 or 2048 MB to start