diff --git a/modules/aws-s3-bucket/main.tf b/modules/aws-s3-bucket/main.tf
index b8ae811..36b82b7 100644
--- a/modules/aws-s3-bucket/main.tf
+++ b/modules/aws-s3-bucket/main.tf
@@ -1,28 +1,23 @@
-/* S3 BACKUPS BUCKET ----------------------------*/
-
-resource "aws_iam_user" "mongodb_backup" {
-  name = "mongodb-backups"
+resource "aws_iam_user" "main" {
+  name = var.bucket_name
 
   tags = {
-    Description = "User for S3 MongoDB backups"
+    Description = "User for ${var.bucket_name} S3 bucket"
   }
 }
 
-resource "aws_iam_access_key" "mongodb_backup" {
-  user    = aws_iam_user.mongodb_backup.name
+resource "aws_iam_access_key" "main" {
+  user    = aws_iam_user.main.name
   pgp_key = file("files/support@dap.ps.gpg")
 }
 
-resource "aws_s3_bucket" "mongodb_backup" {
-  bucket = "dev-dap-ps-mongodb-backups"
+resource "aws_s3_bucket" "main" {
+  bucket = var.bucket_name
   acl    = "private"
 
   tags = {
-    Name = "Bucket for MongoDB backups"
-  }
-
-  lifecycle {
-    prevent_destroy = true
+    Name = var.bucket_name
+    Desc = var.description
   }
 
   policy = <<EOF
@@ -31,9 +26,9 @@ resource "aws_s3_bucket" "mongodb_backup" {
   "Statement": [
     {
       "Effect": "Allow",
-      "Principal": {"AWS": ["${aws_iam_user.mongodb_backup.arn}"]},
-      "Action": ["s3:PutObject","s3:PutObjectAcl"],
-      "Resource":["arn:aws:s3:::dev-dap-ps-mongodb-backups/*"]
+      "Principal": {"AWS": ["${aws_iam_user.main.arn}"]},
+      "Action": ["s3:*"],
+      "Resource":["arn:aws:s3:::${var.bucket_name}/*"]
     }
   ]
 }
diff --git a/modules/aws-s3-bucket/outputs.tf b/modules/aws-s3-bucket/outputs.tf
index a9cec5f..311b710 100644
--- a/modules/aws-s3-bucket/outputs.tf
+++ b/modules/aws-s3-bucket/outputs.tf
@@ -3,12 +3,17 @@
  * For details see: https://www.terraform.io/docs/providers/aws/r/iam_access_key.html
  **/
 
-//output "s3_access_key" {
-//  value = "${aws_iam_access_key.mongodb_backup.id}"
-//}
-//output "s3_secret_key" {
-//  value = "${aws_iam_access_key.mongodb_backup.encrypted_secret}"
-//}
+output "s3_access_key" {
+  value = aws_iam_access_key.main.id
+}
+
+output "s3_secret_key" {
+  value = aws_iam_access_key.main.encrypted_secret
+}
+
+output "bucket_arn" {
+  value = aws_s3_bucket.main.arn
+}
 
 /**
  * This can be decrypted with:
diff --git a/modules/aws-s3-bucket/variables.tf b/modules/aws-s3-bucket/variables.tf
new file mode 100644
index 0000000..5dd5c8b
--- /dev/null
+++ b/modules/aws-s3-bucket/variables.tf
@@ -0,0 +1,10 @@
+variable "bucket_name" {
+  description = "Name of the S3 bucket."
+  type        = string
+}
+
+variable "description" {
+  description = "Description explaining purpose of bucket."
+  type        = string
+  default     = "S3 Bucket created by Terraform"
+}