diff --git a/cloudfront/cloudfront.tf b/cloudfront/cloudfront.tf
new file mode 100644
index 0000000..907d91c
--- /dev/null
+++ b/cloudfront/cloudfront.tf
@@ -0,0 +1,162 @@
+resource "aws_cloudfront_origin_access_identity" "website" {
+  comment = var.domain_name
+}
+
+resource "aws_cloudfront_distribution" "website" {
+  origin {
+    domain_name = var.domain_name
+    origin_id   = "s3"
+
+    s3_origin_config {
+      origin_access_identity = aws_cloudfront_origin_access_identity.website.cloudfront_access_identity_path
+    }
+  }
+
+  dynamic "origin" {
+    for_each = var.cloudfront_origin_custom
+    content {
+      domain_name = origin.value["domain_name"]
+      origin_id   = origin.key
+      custom_origin_config {
+        http_port              = origin.value["http_port"]
+        https_port             = origin.value["https_port"]
+        origin_protocol_policy = origin.value["origin_protocol_policy"]
+        origin_ssl_protocols   = origin.value["origin_ssl_protocols"]
+      }
+    }
+  }
+  
+  dynamic "origin" {
+    for_each = var.cloudfront_origin_s3
+    content {
+      domain_name = origin.value["domain_name"]
+      origin_id   = origin.key
+      s3_origin_config {
+        origin_access_identity = aws_cloudfront_origin_access_identity.website.cloudfront_access_identity_path
+      }
+    }
+  }
+  
+  aliases = var.additional_alias !="" ? flatten([var.domain_name, var.additional_alias]) : [for a in [
+    var.domain_name,
+    var.skip_www ? "" : format("%s%s", "www.", var.domain_name)
+  ] : a if a != ""]
+
+  enabled             = true
+  price_class         = var.priceclass
+  retain_on_delete    = var.retain_on_delete
+  default_root_object = var.index_document
+  is_ipv6_enabled     = "true"
+
+  default_cache_behavior {
+    allowed_methods        = ["DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT"]
+    cached_methods         = ["GET", "HEAD"]
+    target_origin_id       = "s3"
+    viewer_protocol_policy = "redirect-to-https"
+    min_ttl                = var.min_ttl
+    default_ttl            = var.default_ttl
+    max_ttl                = var.max_ttl
+
+    forwarded_values {
+      query_string = false
+
+      cookies {
+        forward = "none"
+      }
+    }
+
+    dynamic "lambda_function_association" {
+      for_each = var.lambda_viewer_request != "" ? [var.lambda_viewer_request] : []
+
+      content {
+        event_type = "viewer-request"
+        lambda_arn = lambda_function_association.value
+      }
+    }
+  }
+
+  dynamic "ordered_cache_behavior" {
+    for_each = var.cloudfront_ordered_cache_behavior
+    content {
+      allowed_methods            = ordered_cache_behavior.value["allowed_methods"]
+      cached_methods             = ordered_cache_behavior.value["cached_methods"]
+      path_pattern               = ordered_cache_behavior.key
+      target_origin_id           = ordered_cache_behavior.value["target_origin_id"]
+      viewer_protocol_policy     = ordered_cache_behavior.value["viewer_protocol_policy"]
+      forwarded_values {
+        query_string = ordered_cache_behavior.value["forwarded_values_query_string"]
+        cookies {
+          forward = ordered_cache_behavior.value["forwarded_values_cookies_forward"]
+        }
+        headers = ordered_cache_behavior.value["forwarded_values_headers"]
+      }
+    }
+  }
+
+  viewer_certificate {
+    acm_certificate_arn      = var.certificate_arn
+    ssl_support_method       = "sni-only"
+    minimum_protocol_version = "TLSv1.2_2019"
+  }
+
+  restrictions {
+    geo_restriction {
+      restriction_type = var.restriction_type
+      locations = [var.locations]
+    }
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 500
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 501
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 502
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 503
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 504
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 400
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 403
+    response_code         = var.index_document_on_404 ? 200 : null
+    response_page_path    = var.index_document_on_404 ? "/${var.index_document}" : null
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 404
+    response_code         = var.index_document_on_404 ? 200 : null
+    response_page_path    = var.index_document_on_404 ? "/${var.index_document}" : null
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 405
+  }
+
+  custom_error_response {
+    error_caching_min_ttl = 0
+    error_code            = 414
+  }
+}
diff --git a/cloudfront/outputs.tf b/cloudfront/outputs.tf
new file mode 100644
index 0000000..d66e0bf
--- /dev/null
+++ b/cloudfront/outputs.tf
@@ -0,0 +1,19 @@
+output "cloudfront_hosted_zone_id" {
+  value = aws_cloudfront_distribution.website.hosted_zone_id
+}
+
+output "cloudfront_domain_name" {
+  value = aws_cloudfront_distribution.website.domain_name
+}
+
+output "url" {
+  value = "https://${var.domain_name}"
+}
+
+output "domain_name" {
+  value = var.domain_name
+}
+
+output "cloudfront_origin_access_identity_arn" {
+  value = aws_cloudfront_origin_access_identity.website.iam_arn
+}
diff --git a/cloudfront/variables.tf b/cloudfront/variables.tf
new file mode 100644
index 0000000..3241afe
--- /dev/null
+++ b/cloudfront/variables.tf
@@ -0,0 +1,39 @@
+# CLOUDFRONT
+
+variable "domain_name" {}
+variable "additional_alias" {default = ""}
+variable "dns_zone_id" { default = "" }
+variable "certificate_arn" {}
+variable "skip_www" { default = false }
+variable "create_dns_record" { default = true }
+variable "index_document_on_404" { default = false }
+variable "index_document" { default = "index.html" }
+variable "min_ttl" { default = 0 }
+variable "default_ttl" { default = 1800 }
+variable "max_ttl" { default = 3600 }
+variable "retain_on_delete" { default = false }
+variable "lambda_viewer_request" { default = "" }
+variable "cloudfront_ordered_cache_behavior" {
+  default     = {}
+  description = "Ordered cache behavior dynamic pool"
+}
+variable "cloudfront_origin_custom" {
+  default     = {}
+  description = "Definition of origins with custom origin config"
+}
+variable "cloudfront_origin_s3" {
+  default     = {}
+  description = "Definition of origins based on s3 buckets"
+}
+variable "locations" {
+  type = string
+  default = ""
+}
+variable "restriction_type" {
+  type = string
+  default = "none"
+}
+variable "priceclass" {
+  type = string
+  default = "PriceClass_100"
+}
\ No newline at end of file