diff --git a/README.md b/README.md
index 0a584dc..0a46f2f 100644
--- a/README.md
+++ b/README.md
@@ -108,15 +108,15 @@ module "account-setup" {
| [ebs\_kms\_key](#module\_ebs\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
| [lambda\_kms\_key](#module\_lambda\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
| [rds\_kms\_key](#module\_rds\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
-| [s3-accesslogs](#module\_s3-accesslogs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-backups](#module\_s3-backups) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-cloudtrail](#module\_s3-cloudtrail) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-config](#module\_s3-config) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-elb-accesslogs](#module\_s3-elb-accesslogs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-fedrampdoc](#module\_s3-fedrampdoc) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
-| [s3-installs](#module\_s3-installs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.1 |
+| [s3-accesslogs](#module\_s3-accesslogs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-backups](#module\_s3-backups) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-cloudtrail](#module\_s3-cloudtrail) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-config](#module\_s3-config) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-elb-accesslogs](#module\_s3-elb-accesslogs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-fedrampdoc](#module\_s3-fedrampdoc) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
+| [s3-installs](#module\_s3-installs) | github.com/Coalfire-CF/terraform-aws-s3 | v1.0.4 |
| [s3\_kms\_key](#module\_s3\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
-| [security-core](#module\_security-core) | github.com/Coalfire-CF/terraform-aws-securitycore | v0.0.19 |
+| [security-core](#module\_security-core) | github.com/Coalfire-CF/terraform-aws-securitycore | v0.0.22 |
| [sm\_kms\_key](#module\_sm\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
| [sns\_kms\_key](#module\_sns\_kms\_key) | github.com/Coalfire-CF/terraform-aws-kms | v0.0.6 |
diff --git a/s3-accesslog.tf b/s3-accesslog.tf
index d8915f3..dd61a12 100644
--- a/s3-accesslog.tf
+++ b/s3-accesslog.tf
@@ -2,7 +2,7 @@ module "s3-accesslogs" {
count = var.create_s3_accesslogs_bucket ? 1 : 0
#checkov:skip=CKV_AWS_145: "Ensure that S3 buckets are encrypted with KMS by default"
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-s3-accesslogs"
attach_public_policy = false
diff --git a/s3-aws-config.tf b/s3-aws-config.tf
index 87e7e9b..97937c4 100644
--- a/s3-aws-config.tf
+++ b/s3-aws-config.tf
@@ -1,7 +1,7 @@
module "s3-config" {
count = var.create_s3_config_bucket ? 1 : 0
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-config"
kms_master_key_id = module.s3_kms_key[0].kms_key_arn
diff --git a/s3-backups.tf b/s3-backups.tf
index e26dd87..8c7aa6c 100644
--- a/s3-backups.tf
+++ b/s3-backups.tf
@@ -1,7 +1,7 @@
module "s3-backups" {
count = var.create_s3_backups_bucket ? 1 : 0
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-backups"
kms_master_key_id = module.s3_kms_key[0].kms_key_arn
diff --git a/s3-cloudtrail.tf b/s3-cloudtrail.tf
index 2acd4bf..463e945 100644
--- a/s3-cloudtrail.tf
+++ b/s3-cloudtrail.tf
@@ -1,5 +1,5 @@
module "s3-cloudtrail" {
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
count = var.create_cloudtrail && var.default_aws_region == var.aws_region ? 1 : 0
diff --git a/s3-elb-accesslog.tf b/s3-elb-accesslog.tf
index 1f0edec..3afede8 100644
--- a/s3-elb-accesslog.tf
+++ b/s3-elb-accesslog.tf
@@ -2,7 +2,7 @@ module "s3-elb-accesslogs" {
count = var.create_s3_elb_accesslogs_bucket ? 1 : 0
#checkov:skip=CKV_AWS_145: "Ensure that S3 buckets are encrypted with KMS by default"
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-elb-accesslogs"
attach_public_policy = false
diff --git a/s3-fedrampdoc.tf b/s3-fedrampdoc.tf
index f05ea6f..822e7df 100644
--- a/s3-fedrampdoc.tf
+++ b/s3-fedrampdoc.tf
@@ -1,7 +1,7 @@
module "s3-fedrampdoc" {
count = var.create_s3_fedrampdoc_bucket ? 1 : 0
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-fedrampdoc"
kms_master_key_id = module.s3_kms_key[0].kms_key_arn
@@ -14,17 +14,4 @@ module "s3-fedrampdoc" {
logging = true
target_bucket = module.s3-accesslogs[0].id
target_prefix = "fedrampdoc/"
-
- lifecycle_configuration_rules = [
- {
- id = "default"
- enabled = true
-
- enable_glacier_transition = false
- enable_current_object_expiration = false
- enable_noncurrent_version_expiration = false
-
- abort_incomplete_multipart_upload_days = 1
- }
- ]
}
diff --git a/s3-installs.tf b/s3-installs.tf
index f97b6fc..1921440 100644
--- a/s3-installs.tf
+++ b/s3-installs.tf
@@ -1,7 +1,7 @@
module "s3-installs" {
count = var.create_s3_installs_bucket ? 1 : 0
- source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.1"
+ source = "github.com/Coalfire-CF/terraform-aws-s3?ref=v1.0.4"
name = "${var.resource_prefix}-${var.aws_region}-installs"
kms_master_key_id = module.s3_kms_key[0].kms_key_arn
@@ -14,17 +14,4 @@ module "s3-installs" {
logging = true
target_bucket = module.s3-accesslogs[0].id
target_prefix = "installs/"
-
- lifecycle_configuration_rules = [
- {
- id = "default"
- enabled = true
-
- enable_glacier_transition = false
- enable_current_object_expiration = false
- enable_noncurrent_version_expiration = false
-
- abort_incomplete_multipart_upload_days = 1
- }
- ]
}
diff --git a/security-core.tf b/security-core.tf
index fdc9968..1864e27 100644
--- a/security-core.tf
+++ b/security-core.tf
@@ -1,8 +1,7 @@
module "security-core" {
count = var.create_security_core ? 1 : 0
- #source = "github.com/Coalfire-CF/terraform-aws-securitycore?ref=fb87eca3e93fb973085b8146b53c9b89117c1378"
- source = "github.com/Coalfire-CF/terraform-aws-securitycore?ref=v0.0.19"
+ source = "github.com/Coalfire-CF/terraform-aws-securitycore?ref=v0.0.22"
application_account_numbers = var.application_account_numbers
aws_region = var.aws_region