diff --git a/lab/_envcommon/aws-provider.hcl b/lab/_envcommon/aws-provider.hcl
new file mode 100644
index 0000000..e7357e1
--- /dev/null
+++ b/lab/_envcommon/aws-provider.hcl
@@ -0,0 +1,36 @@
+include "root" {
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
+}
+
+# Generate an AWS provider block
+generate "aws_provider" {
+  path      = "${get_original_terragrunt_dir()}/aws_provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+  terraform {
+    required_version = ">= 1.5.0"
+  }
+  provider "aws" {
+    region = "${include.root.inputs.aws_region}"
+    profile = "${include.root.inputs.aws_profile}"
+    default_tags {
+      tags = {
+        ProjectNumber = "${include.root.inputs.project_number}"
+        "Project Name" = "${include.root.inputs.project_name}"
+        "Project Role" = "${include.root.inputs.project_role}"
+        "Project Identifier" = "${include.root.inputs.project_number}:${include.root.inputs.project_name}"
+        Organization = "${include.root.inputs.organization}"
+        created_by = "${include.root.inputs.creator}"
+        created_for = "${include.root.inputs.creator}"
+        created_reason = "${include.root.inputs.created_reason}"
+        Terraform = "${include.root.inputs.terraform}"
+        Terragrunt = "${include.root.inputs.terragrunt}"
+      }
+    }
+    # Only these AWS Account IDs may be operated on by this template
+    allowed_account_ids = ["${include.root.inputs.account_id}"]
+  }
+EOF
+}
diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl
index c7252f3..aa8af71 100644
--- a/lab/_envcommon/common-variables.hcl
+++ b/lab/_envcommon/common-variables.hcl
@@ -4,8 +4,12 @@
 # that are common across all environments/accounts.
 # ---------------------------------------------------------------------------------------------------------------------
 locals {
-  project_number = "fs0000000078"
-  project_name   = "csvd_platformbaseline"
-  project_role   = "csvd_platformbaseline_app"
-  organization   = "census:ocio:csvd"
-}
\ No newline at end of file
+  organization        = "census:ocio:csvd"
+  project_name        = "csvd_platformbaseline"
+  project_number      = "fs0000000078"
+  project_role        = "csvd_platformbaseline_app"
+  state_bucket_prefix = "inf-tfstate"
+  state_table_name    = "tf_remote_state"
+  terraform           = true
+  terragrunt          = true
+}
diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
new file mode 100644
index 0000000..cdfeb5f
--- /dev/null
+++ b/lab/_envcommon/helm-provider.hcl
@@ -0,0 +1,40 @@
+# lab/_envcommon/helm-provider.hcl
+
+dependency "eks" {
+  config_path = "${get_original_terragrunt_dir()}/../eks"
+  mock_outputs = {
+    cluster_certificate_authority_data              = [{data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP"}]
+    cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
+    cluster_name                                    = "a-cluster-name"
+    eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
+    oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
+    security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
+    subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
+    token                                           = [{token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER"}]
+    vpc_id                                          = "a-vpc-id"
+  }
+}
+
+# Generate a helm provider block
+generate "helm_provider" {
+  path      = "${get_original_terragrunt_dir()}/helm_provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+  terraform {
+    required_version = ">= 1.5.0"
+  }
+  data "aws_eks_cluster" "helm" {
+    name = "${dependency.eks.outputs.cluster_name}"
+  }
+  data "aws_eks_cluster_auth" "helm" {
+    name = "${dependency.eks.outputs.cluster_name}"
+  }
+  provider "helm" {
+    kubernetes {
+      host                   = data.aws_eks_cluster.helm[0].endpoint
+      cluster_ca_certificate = base64decode(data.aws_eks_cluster.helm[0].certificate_authority[0].data)
+      token                  = data.aws_eks_cluster_auth.helm.token
+    }
+  }
+EOF
+}
diff --git a/lab/_envcommon/kubernetes-provider.hcl b/lab/_envcommon/kubernetes-provider.hcl
new file mode 100644
index 0000000..066850d
--- /dev/null
+++ b/lab/_envcommon/kubernetes-provider.hcl
@@ -0,0 +1,38 @@
+# lab/_envcommon/kubernetes-provider.hcl
+
+dependency "eks" {
+  config_path = "${get_original_terragrunt_dir()}/../eks"
+  mock_outputs = {
+    cluster_certificate_authority_data              = [{data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP"}]
+    cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
+    cluster_name                                    = "a-cluster-name"
+    eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
+    oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
+    security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
+    subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
+    token                                           = [{token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER"}]
+    vpc_id                                          = "a-vpc-id"
+  }
+}
+
+# Generate a k8s provider block
+generate "kube_provider" {
+  path      = "${get_original_terragrunt_dir()}/kube_provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+  terraform {
+    required_version = ">= 1.5.0"
+  }
+  data "aws_eks_cluster" "kube" {
+    name = "${dependency.eks.outputs.cluster_name}"
+  }
+  data "aws_eks_cluster_auth" "kube" {
+    name = "${dependency.eks.outputs.cluster_name}"
+  }
+  provider "kubernetes" {
+    host                   = data.aws_eks_cluster.kube.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.kube.certificate_authority[0].data)
+    token                  = data.aws_eks_cluster_auth.kube.token
+  }
+EOF
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl
index 5b0d9d8..cd5a4c8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl
@@ -23,7 +23,7 @@ dependency "istio" {
   mock_outputs = {
     istio_ingress_lb = {
       dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
-      zone_id = "ZABC123456DEF"
+      zone_id  = "ZABC123456DEF"
     }
   }
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-k8s-dashboard/terragrunt.hcl
index 9fbed89..d8587df 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-k8s-dashboard/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-k8s-dashboard/terragrunt.hcl
@@ -15,7 +15,7 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
-    cluster_name = "a-cluster-name"
+    cluster_name    = "a-cluster-name"
     vpc_domain_name = "example.com"
   }
 }
@@ -26,11 +26,11 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile           = include.root.inputs.aws_profile
-  region            = include.root.inputs.aws_region
-  cluster_name      = dependency.eks.outputs.cluster_name
-  cluster_domain    = dependency.eks.inputs.vpc_domain_name
-  public_hostname   = "dashboard"
+  profile         = include.root.inputs.aws_profile
+  region          = include.root.inputs.aws_region
+  cluster_name    = dependency.eks.outputs.cluster_name
+  cluster_domain  = dependency.eks.inputs.vpc_domain_name
+  public_hostname = "dashboard"
   # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
   # k8s_dashboard_version = "v2.0.0"  # NEW IDEA TO START PINNING VERSIONING OF COMPONENT TO TF MODULE VERSION
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks/terragrunt.hcl
index 4cf7f5f..ea3333e 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks/terragrunt.hcl
@@ -5,11 +5,11 @@ include "root" {
 
 locals {
   # Set cluster/platform specific variables, or extract from the hierarchy. 
-  account_id                               = include.root.inputs.aws_account_id
+  account_id                               = include.root.inputs.account_id
   cluster_endpoint_public_access           = true
-  cluster_name                             = "platform-eng-cicd-test"
-  cluster_version                          = "1.30"
-  creator                                  = "matthew.c.morgan@census.gov"
+  cluster_name                             = include.root.inputs.cluster_name
+  cluster_version                          = include.root.inputs.cluster_version
+  creator                                  = include.root.inputs.creator
   eks_instance_disk_size                   = 100
   eks_ng_desired_size                      = 2
   eks_ng_max_size                          = 10
@@ -23,8 +23,8 @@ locals {
   project_number                           = include.root.inputs.project_number
   project_role                             = include.root.inputs.project_role
   region                                   = include.root.inputs.aws_region
-  terraform                                = true
-  terragrunt                               = true
+  terraform                                = include.root.locals.terraform
+  terragrunt                               = include.root.locals.terragrunt
   vpc_domain_name                          = include.root.inputs.vpc_domain_name
 
   # Tags applied to AWS objects created
@@ -43,48 +43,6 @@ terraform {
   }
 }
 
-# Generate an AWS provider block
-generate "provider" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-terraform {
-  required_version = ">= 1.5.0"
-}
-provider "aws" {
-  region = "${local.region}"
-  profile = "${local.profile}"
-  default_tags {
-    tags = {
-      ProjectNumber = "${local.project_number}"
-      "Project Name" = "${local.project_name}"
-      "Project Role" = "${local.project_role}"
-      "Project Identifier" = "${local.project_number}:${local.project_name}"
-      Organization = "${local.organization}"
-      created_by = "${local.creator}"
-      created_for = "${local.creator}"
-      created_reason = "Terragrunt Development for CICD Delivered EKS Platform"
-      Terraform = "${local.terraform}"
-      Terragrunt = "${local.terragrunt}"
-    }
-  }
-  # Only these AWS Account IDs may be operated on by this template
-  allowed_account_ids = ["${local.account_id}"]
-}
-
-provider "kubernetes" {
-  config_path    = "~/.kube/config"
-}
- 
-provider "helm" {
-  kubernetes {
-      config_path = "~/.kube/config"
-    }
-}
-
-EOF
-}
-
 inputs = {
   aws_account_id                           = local.account_id
   cluster_endpoint_public_access           = local.cluster_endpoint_public_access
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
new file mode 100644
index 0000000..59ea4e6
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
@@ -0,0 +1,21 @@
+# Set cluster specific variables. These are automatically pulled in to configure the remote state bucket in the root
+# terragrunt.hcl configuration.
+locals {
+  cluster_endpoint_public_access           = true
+  cluster_name                             = "platform-eng-eks-mcm"
+  cluster_version                          = "1.30"
+  creator                                  = "matthew.c.morgan@census.gov"
+  eks_instance_disk_size                   = 100
+  eks_ng_desired_size                      = 2
+  eks_ng_max_size                          = 10
+  eks_ng_min_size                          = 0
+  enable_cluster_creator_admin_permissions = true
+  environment_abbr                         = "dev"
+  terraform                                = true
+  terragrunt                               = true
+  tags = {
+    "Environment"   = local.environment_abbr
+    "slim:schedule" = "8:00-17:00"
+    "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
+  }
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl
index ed589d6..f6be0fb 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
@@ -19,10 +20,10 @@ dependency "eks" {
   }
 }
 
-# dependency "karpenter" {
-#   config_path = "../eks-karpenter"
-#   skip_outputs = true
-# }
+dependency "eks_config" {
+  config_path  = "../eks-config"
+  skip_outputs = true
+}
 
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
index d1b96dc..b13262c 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
@@ -1,12 +1,11 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+
 include "root" {
-  path   = find_in_parent_folders()
+  path   = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
   expose = true
 }
 
-# locals {
-#   tag_costallocation = "census:csvd:platformbaseline"
-# }
-
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=0.1.1"
   extra_arguments "retry_lock" {
@@ -18,15 +17,70 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
-    vpc_id                                          = "a-vpc-id"
+    cluster_certificate_authority_data              = [{data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP"}]
+    cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
     cluster_name                                    = "a-cluster-name"
-    subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003", ]
-    security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
     eks_managed_node_groups_autoscaling_group_names = ["eks-eks-a-cluster-name-node_group-0000000000000000000000000-5ac8a5e3-14dd-c043-2cc9-f4b6ffb36d32"]
     oidc_provider_arn                               = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
+    security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
+    subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
+    token                                           = [{token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER"}]
+    vpc_id                                          = "a-vpc-id"
   }
 }
 
+# locals {
+#   kube_provider = read_terragrunt_config(find_in_parent_folders("_envcommon/kubernetes-provider.hcl"))
+# }
+
+# generate = local.kube_provider.generate
+
+# # Generate a k8s provider block
+# generate "kube_provider" {
+#   path      = "kube_provider.tf"
+#   if_exists = "overwrite_terragrunt"
+#   contents  = <<-EOF
+#   terraform {
+#     required_version = ">= 1.5.0"
+#   }
+#   data "aws_eks_cluster" "kube" {
+#     name = "${dependency.eks.outputs.cluster_name}"
+#   }
+#   data "aws_eks_cluster_auth" "kube" {
+#     name = "${dependency.eks.outputs.cluster_name}"
+#   }
+#   provider "kubernetes" {
+#     host                   = data.aws_eks_cluster.kube[0].endpoint
+#     cluster_ca_certificate = base64decode(data.aws_eks_cluster.kube[0].certificate_authority[0].data)
+#     token                  = data.aws_eks_cluster_auth.kube.token
+#   }
+# EOF
+# }
+
+# # Generate a helm provider block
+# generate "helm_provider" {
+#   path      = "helm_provider.tf"
+#   if_exists = "overwrite_terragrunt"
+#   contents  = <<-EOF
+#   terraform {
+#     required_version = ">= 1.5.0"
+#   }
+#   data "aws_eks_cluster" "helm" {
+#     name = "${dependency.eks.outputs.cluster_name}"
+#   }
+#   data "aws_eks_cluster_auth" "helm" {
+#     name = "${dependency.eks.outputs.cluster_name}"
+#   }
+#   provider "helm" {
+#     kubernetes {
+#       host                   = data.aws_eks_cluster.helm[0].endpoint
+#       cluster_ca_certificate = base64decode(data.aws_eks_cluster.helm[0].certificate_authority[0].data)
+#       token                  = data.aws_eks_cluster_auth.helm.token
+#     }
+#   }
+# EOF
+# }
+
 inputs = {
   profile                                         = include.root.inputs.aws_profile
   region                                          = include.root.inputs.aws_region
@@ -36,7 +90,4 @@ inputs = {
   security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
   eks_managed_node_groups_autoscaling_group_names = dependency.eks.outputs.eks_managed_node_groups_autoscaling_group_names
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
-  # tags                                            = dependency.eks.inputs.tags
-  # tag_costallocation                              = local.tag_costallocation
-  # cluster_autoscaler_role_name                    = dependency.eks.outputs.cluster_autoscaler_role_name
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
index 5b0d9d8..fb61c7a 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
@@ -23,7 +24,7 @@ dependency "istio" {
   mock_outputs = {
     istio_ingress_lb = {
       dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
-      zone_id = "ZABC123456DEF"
+      zone_id  = "ZABC123456DEF"
     }
   }
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
index ad41bce..62eecce 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
index de80020..161aea8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl
index 9fbed89..ba97001 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-k8s-dashboard/terragrunt.hcl
@@ -1,7 +1,7 @@
-
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
@@ -15,7 +15,7 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
-    cluster_name = "a-cluster-name"
+    cluster_name    = "a-cluster-name"
     vpc_domain_name = "example.com"
   }
 }
@@ -26,11 +26,11 @@ dependency "eks-loki" {
 }
 
 inputs = {
-  profile           = include.root.inputs.aws_profile
-  region            = include.root.inputs.aws_region
-  cluster_name      = dependency.eks.outputs.cluster_name
-  cluster_domain    = dependency.eks.inputs.vpc_domain_name
-  public_hostname   = "dashboard"
+  profile         = include.root.inputs.aws_profile
+  region          = include.root.inputs.aws_region
+  cluster_name    = dependency.eks.outputs.cluster_name
+  cluster_domain  = dependency.eks.inputs.vpc_domain_name
+  public_hostname = "dashboard"
   # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
   # k8s_dashboard_version = "v2.0.0"  # NEW IDEA TO START PINNING VERSIONING OF COMPONENT TO TF MODULE VERSION
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
index 8ae33c1..eefcf2f 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
index b63f466..6505e20 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl.disable
@@ -1,6 +1,7 @@
 include "root" {
-  path = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl
index a20f01d..7facd18 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
index 5d9c5b7..c5ec815 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
@@ -18,6 +19,11 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path  = "../eks-config"
+  skip_outputs = true
+}
+
 inputs = {
   profile      = include.root.inputs.aws_profile
   cluster_name = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl
index 4d4e9fc..6e059b6 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
index 4f290f8..2f1d8ea 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
@@ -1,6 +1,7 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
index 36965cc..bf6e9d5 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks/terragrunt.hcl
@@ -1,21 +1,22 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 locals {
   # Set cluster/platform specific variables, or extract from the hierarchy. 
   account_id                               = include.root.inputs.aws_account_id
-  cluster_endpoint_public_access           = true
-  cluster_name                             = "platform-eng-eks-mcm"
-  cluster_version                          = "1.30"
-  creator                                  = "matthew.c.morgan@census.gov"
-  eks_instance_disk_size                   = 100
-  eks_ng_desired_size                      = 2
-  eks_ng_max_size                          = 10
-  eks_ng_min_size                          = 0
+  cluster_endpoint_public_access           = include.root.inputs.cluster_endpoint_public_access
+  cluster_name                             = include.root.inputs.cluster_name
+  cluster_version                          = include.root.inputs.cluster_version
+  creator                                  = include.root.inputs.creator
+  eks_instance_disk_size                   = include.root.inputs.eks_instance_disk_size
+  eks_ng_desired_size                      = include.root.inputs.eks_ng_desired_size
+  eks_ng_max_size                          = include.root.inputs.eks_ng_max_size
+  eks_ng_min_size                          = include.root.inputs.eks_ng_min_size
   eks_vpc_name                             = include.root.inputs.vpc_name
-  enable_cluster_creator_admin_permissions = true
+  enable_cluster_creator_admin_permissions = include.root.inputs.enable_cluster_creator_admin_permissions
   environment_abbr                         = include.root.inputs.environment_abbr
   organization                             = include.root.inputs.organization
   profile                                  = include.root.inputs.aws_profile
@@ -23,16 +24,10 @@ locals {
   project_number                           = include.root.inputs.project_number
   project_role                             = include.root.inputs.project_role
   region                                   = include.root.inputs.aws_region
-  terraform                                = true
-  terragrunt                               = true
+  tags                                     = include.root.inputs.tags
+  terraform                                = include.root.inputs.terraform
+  terragrunt                               = include.root.inputs.terragrunt
   vpc_domain_name                          = include.root.inputs.vpc_domain_name
-
-  # Tags applied to AWS objects created
-  tags = {
-    "Environment"   = local.environment_abbr
-    "slim:schedule" = "8:00-17:00"
-    "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
-  }
 }
 
 terraform {
@@ -43,47 +38,35 @@ terraform {
   }
 }
 
-# Generate an AWS provider block
-generate "provider" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-terraform {
-  required_version = ">= 1.5.0"
-}
-provider "aws" {
-  region = "${local.region}"
-  profile = "${local.profile}"
-  default_tags {
-    tags = {
-      ProjectNumber = "${local.project_number}"
-      "Project Name" = "${local.project_name}"
-      "Project Role" = "${local.project_role}"
-      "Project Identifier" = "${local.project_number}:${local.project_name}"
-      Organization = "${local.organization}"
-      created_by = "${local.creator}"
-      created_for = "${local.creator}"
-      created_reason = "Terragrunt Development for CICD Delivered EKS Platform"
-      Terraform = "${local.terraform}"
-      Terragrunt = "${local.terragrunt}"
-    }
-  }
-  # Only these AWS Account IDs may be operated on by this template
-  allowed_account_ids = ["${local.account_id}"]
-}
-
-provider "kubernetes" {
-  config_path    = "~/.kube/config"
-}
- 
-provider "helm" {
-  kubernetes {
-      config_path = "~/.kube/config"
-    }
-}
-
-EOF
-}
+# generate "aws_provider" {
+#   path      = "aws_provider.tf"
+#   if_exists = "overwrite_terragrunt"
+#   contents  = <<EOF
+#   terraform {
+#     required_version = ">= 1.5.0"
+#   }
+#   provider "aws" {
+#     region = "${local.region}"
+#     profile = "${local.profile}"
+#     default_tags {
+#       tags = {
+#         ProjectNumber = "${local.project_number}"
+#         "Project Name" = "${local.project_name}"
+#         "Project Role" = "${local.project_role}"
+#         "Project Identifier" = "${local.project_number}:${local.project_name}"
+#         Organization = "${local.organization}"
+#         created_by = "${local.creator}"
+#         created_for = "${local.creator}"
+#         created_reason = "Terragrunt Development for CICD Delivered EKS Platform"
+#         Terraform = "${local.terraform}"
+#         Terragrunt = "${local.terragrunt}"
+#       }
+#     }
+#     # Only these AWS Account IDs may be operated on by this template
+#     allowed_account_ids = ["${local.account_id}"]
+#   }
+# EOF
+# }
 
 inputs = {
   aws_account_id                           = local.account_id
diff --git a/lab/terragrunt.hcl b/lab/root.hcl
similarity index 85%
rename from lab/terragrunt.hcl
rename to lab/root.hcl
index cc780ba..d11dde9 100644
--- a/lab/terragrunt.hcl
+++ b/lab/root.hcl
@@ -3,22 +3,25 @@
 # Terragrunt is a thin wrapper for Terraform that provides extra tools for working with multiple Terraform modules,
 # remote state, and locking: https://github.com/gruntwork-io/terragrunt
 # ---------------------------------------------------------------------------------------------------------------------
-
 locals {
-  # Automatically load _envcommon, cross account and environment common variables
-  common_vars = read_terragrunt_config("${dirname(find_in_parent_folders())}/_envcommon/common-variables.hcl", "skip-account-if-does-not-exist")
-
   # Automatically load account-level variables (NOTE: In our environment account = environment so there is not separate environment layer)
   account_vars = read_terragrunt_config(find_in_parent_folders("account.hcl"))
 
+  # Automatically load _envcommon, cross account and environment common variables
+  common_vars = read_terragrunt_config(find_in_parent_folders("./_envcommon/common-variables.hcl"))
+
+  # Automatically load cluster-level variables
+  cluster_vars = read_terragrunt_config(find_in_parent_folders("cluster.hcl"))
+
   # Automatically load region-level variables
-  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl", "skip-account-if-does-not-exist"))
+  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
 
   # Automatically load vpc-level variables
-  vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist"))
+  vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl"))
+  # kube_provider = read_terragrunt_config(find_in_parent_folders("./_envcommon/kubeernetes-provider.hcl"))
+  # helm_provider = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl"))
 
   # Extract the variables we need for easy access
-  account_name        = local.account_vars.locals.account_name
   account_id          = local.account_vars.locals.aws_account_id
   aws_profile         = local.account_vars.locals.aws_profile
   aws_region          = local.region_vars.locals.aws_region
@@ -26,10 +29,8 @@ locals {
   project_number      = local.common_vars.locals.project_number
   project_name        = local.common_vars.locals.project_name
   project_role        = local.common_vars.locals.project_role
-  state_bucket_prefix = "inf-tfstate"
-  state_table_name    = "tf_remote_state"
-  terraform           = true
-  terragrunt          = true
+  state_bucket_prefix = local.common_vars.locals.state_bucket_prefix
+  state_table_name    = local.common_vars.locals.state_table_name
 }
 
 # Configure Terragrunt to automatically store tfstate files in an S3 bucket
@@ -64,8 +65,9 @@ remote_state {
 # Configure root level variables that all resources can inherit. This is especially helpful with multi-account configs
 # where terraform_remote_state data sources are placed directly into the modules.
 inputs = merge(
-  local.common_vars.locals,
   local.account_vars.locals,
+  local.cluster_vars.locals,
+  local.common_vars.locals,
   local.region_vars.locals,
-  local.vpc_vars.locals,
+  local.vpc_vars.locals
 )