diff --git a/static-website/bucket.tf b/static-website/bucket.tf
index 783cde1..e468ddd 100644
--- a/static-website/bucket.tf
+++ b/static-website/bucket.tf
@@ -1,31 +1,55 @@
 resource "aws_s3_bucket" "website" {
   bucket = local.bucket_name
+
+  tags = {
+    Name = local.bucket_name
+  }
+}
+
+resource "aws_s3_bucket_versioning" "versioning" {
+  bucket = aws_s3_bucket.website.id
+  versioning_configuration {
+    status = var.versioning
+  }
+}
+
+resource "aws_s3_bucket_acl" "acl" {
+  bucket = aws_s3_bucket.website.id
   acl    = "private"
-  policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "${aws_cloudfront_origin_access_identity.website.iam_arn}"
-      },
-      "Action": "s3:GetObject",
-      "Resource": "arn:aws:s3:::${local.bucket_name}/*"
-    }
-  ]
 }
-EOF
-  versioning {
-    enabled = var.versioning
+
+resource "aws_s3_bucket_policy" "policy" {
+  bucket = aws_s3_bucket.website.id
+  policy = data.aws_iam_policy_document.policy.json
+}
+
+data "aws_iam_policy_document" "policy" {
+  statement {
+    principals {
+      type        = "AWS"
+      identifiers = [
+        "${aws_cloudfront_origin_access_identity.website.iam_arn}"
+      ]
+    }
+
+    actions = [
+      "s3:GetObject"
+    ]
+
+    resources = [
+      "arn:aws:s3:::${local.bucket_name}/*"
+    ]
   }
+}
+
+resource "aws_s3_bucket_website_configuration" "website" {
+  bucket = aws_s3_bucket.website.bucket
 
-  website {
-    index_document = var.index_document
-    error_document = var.error_document
+  index_document {
+    suffix = var.index_document
   }
 
-  tags = {
-    Name = local.bucket_name
+  error_document {
+    key = var.error_document
   }
-}
+}
\ No newline at end of file