diff --git a/docker.tf b/docker.tf
index 57d7a85..76101f8 100644
--- a/docker.tf
+++ b/docker.tf
@@ -47,6 +47,7 @@ module "docker" {
     }
   ]
   packer_source_type = "S3"
+  packer_config = "docker-base.pkr.hcl"
   packer_bucket = {
     name = aws_s3_bucket.assets_bucket.bucket
     key  = "docker-image-pipeline.zip"
@@ -57,13 +58,13 @@ module "docker" {
     key  = "image-pipeline-ansible-playbooks.zip"
   }
   playbook         = "ubuntu-base.yaml"
+  goss_profile        = "docker-base"
   goss_source_type = "S3"
   goss_bucket = {
     name = aws_s3_bucket.assets_bucket.bucket
     key  = "image-pipeline-goss-testing.zip"
   }
   docker_test_enabled = true
-  goss_profile        = "docker-base"
   state               = local.state_config
   vpc_config          = local.vpc_config
   image = {
diff --git a/linux.tf b/linux.tf
index 33cc29c..3ac0db6 100644
--- a/linux.tf
+++ b/linux.tf
@@ -50,8 +50,8 @@ output "linux_iam_arn" {
   value = module.amazon_linux.iam_arn
 }
 
-output "linux_parameters" {
-  value     = keys(module.amazon_linux.parameters)
+output "linux_managed_parameters" {
+  value     = keys(module.amazon_linux.managed_parameters)
   sensitive = true
 }
 
diff --git a/main.tf b/main.tf
index e77926c..34bd02d 100644
--- a/main.tf
+++ b/main.tf
@@ -20,6 +20,7 @@ data "aws_iam_policy_document" "assets_bucket_policy_document" {
       type = "AWS"
       identifiers = [
         module.amazon_linux.iam_arn,
+        module.rhel.iam_arn,
         module.docker.iam_arn
       ]
     }
diff --git a/rhel.tf b/rhel.tf
index 0b2e5bf..86a043b 100644
--- a/rhel.tf
+++ b/rhel.tf
@@ -18,9 +18,21 @@ module "rhel" {
       type  = "PLAINTEXT"
     }
   ]
-  packer_repo  = data.aws_codecommit_repository.linux
-  ansible_repo = data.aws_codecommit_repository.ansible
-  goss_repo    = data.aws_codecommit_repository.goss
+  packer_source_type = "S3"
+  packer_bucket = {
+    name = aws_s3_bucket.assets_bucket.bucket
+    key  = "linux-image-pipeline.zip"
+  }
+  ansible_source_type = "S3"
+  ansible_bucket = {
+    name = aws_s3_bucket.assets_bucket.bucket
+    key  = "image-pipeline-ansible-playbooks.zip"
+  }
+  goss_source_type = "S3"
+  goss_bucket = {
+    name = aws_s3_bucket.assets_bucket.bucket
+    key  = "image-pipeline-goss-testing.zip"
+  }
   goss_profile = "rhel-base-test"
   # goss_profile  = "base-test"
   state      = local.state_config