diff --git a/examples/test-data/GUIDE.md b/examples/test-data/GUIDE.md
index 44256ae..c5d4073 100644
--- a/examples/test-data/GUIDE.md
+++ b/examples/test-data/GUIDE.md
@@ -18,7 +18,7 @@ You can submit the data in two ways.
 
 ### Submission as request body
 
-You can simply copy the edited JSON content in to the API gateway `/submit` POST endpoint. If you're using a REST client make sure you add authorization headers before you make the request. For example, Postman supports Authorization type AWS Signature and there you can enter AWS Keys.
+You can simply copy the edited JSON content in to the API gateway `/submit_dataset` POST endpoint. If you're using a REST client make sure you add authorization headers before you make the request. For example, Postman supports Authorization type AWS Signature and there you can enter AWS Keys.
 
 ### Submission as an S3 payload
 
@@ -324,4 +324,4 @@ Result
     },
     "beaconHandovers": []
 }
-```
\ No newline at end of file
+```
diff --git a/s3.tf b/s3.tf
index 1e4c749..9092f25 100644
--- a/s3.tf
+++ b/s3.tf
@@ -7,7 +7,16 @@ resource "aws_s3_bucket" "variants-bucket" {
   tags          = var.common-tags
 }
 
+resource "aws_s3_bucket_ownership_controls" "variants_bucket_ownership_controls" {
+  bucket = aws_s3_bucket.variants-bucket.id
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
+
 resource "aws_s3_bucket_acl" "variants_bucket_acl" {
+  depends_on = [aws_s3_bucket_ownership_controls.variants_bucket_ownership_controls]
+
   bucket = aws_s3_bucket.variants-bucket.id
   acl    = "private"
 }
@@ -38,7 +47,16 @@ resource "aws_s3_bucket" "metadata-bucket" {
   tags          = var.common-tags
 }
 
+resource "aws_s3_bucket_ownership_controls" "metadata_bucket_ownership_controls" {
+  bucket = aws_s3_bucket.metadata-bucket.id
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
+
 resource "aws_s3_bucket_acl" "metadata" {
+  depends_on = [aws_s3_bucket_ownership_controls.metadata_bucket_ownership_controls]
+
   bucket = aws_s3_bucket.metadata-bucket.id
   acl    = "private"
 }
@@ -82,7 +100,16 @@ resource "aws_s3_bucket" "lambda-layers-bucket" {
   tags          = var.common-tags
 }
 
+resource "aws_s3_bucket_ownership_controls" "lambda_layers_bucket_ownership_controls" {
+  bucket = aws_s3_bucket.lambda-layers-bucket.id
+  rule {
+    object_ownership = "BucketOwnerPreferred"
+  }
+}
+
 resource "aws_s3_bucket_acl" "lambda-layers" {
+  depends_on = [aws_s3_bucket_ownership_controls.lambda_layers_bucket_ownership_controls]
+
   bucket = aws_s3_bucket.lambda-layers-bucket.id
   acl    = "private"
 }