diff --git a/terraform/organization/apigw.tf b/terraform/organization/apigw.tf
index 7373f09..ccbecac 100644
--- a/terraform/organization/apigw.tf
+++ b/terraform/organization/apigw.tf
@@ -12,7 +12,7 @@ module "apigw" {
   name                  = "AWSAPIGateway-g3"
   description           = "..."
   lambda_function_arn   = module.lambda["lambda"].lambda_function_arn
-  lambda_function_name  = "lambda"
+  lambda_function_name  = module.lambda["lambda"].lambda_function_name
   lambda_source_arn     = "arn:aws:execute-api:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}"
   
   tags = { 
diff --git a/terraform/organization/cloudfront.tf b/terraform/organization/cloudfront.tf
index 74d4ee3..22573f0 100644
--- a/terraform/organization/cloudfront.tf
+++ b/terraform/organization/cloudfront.tf
@@ -35,7 +35,7 @@ module "cloudfront" {
     target_origin_id        = "s3"
     viewer_protocol_policy  = "allow-all"
 
-    allowed_methods = ["DELETE", "GET", "HEAD", "POST", "PUT"]
+    allowed_methods = ["GET", "HEAD", "OPTIONS"]
     cached_methods  = ["GET", "HEAD"]
 
     min_ttl     = 0