diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl
new file mode 100644
index 0000000..e39a94d
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/common_vars.hcl
@@ -0,0 +1,169 @@
+locals {
+  # 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 region-level variables
+  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
+
+  # Which AWS_PROFILE to use to perform the operations
+  profile = local.account_vars.locals.aws_profile
+
+  # In which AWS region are operations being performed
+  region = local.region_vars.locals.aws_region
+
+  # Tags applied to AWS objects created
+  application_tags = {
+    "Project Name"   = local.project_name
+    "ProjectNumber"  = local.project_number
+    "CostAllocation" = local.organization
+    "Organization"   = local.organization
+    "Environment"    = local.account_vars.locals.environment
+  }
+
+  ####################################################
+  ## VPC Information
+  ####################################################
+  # Information about the VPC in which artifacts are being created
+
+  vpc_name          = "vpc3-lab-dev"
+ 
+  ####################################################
+  ## EKS Configuration
+  ####################################################
+
+  # The name of the EKS cluster
+  cluster_name = "platform-eng-eks-mcm"
+
+  # The kubernetes version to use for the cluster
+  cluster_version = "1.30"
+
+  # The domain in which the cluster is being built
+  domain = local.account_vars.locals.domain_name
+
+  # The size of the disk for the worker nodes, in GB
+  # Loki claims 60 GB - 10g claims - 2 services each with 3 replicas
+  # Prometheus claims 10g 
+  eks_instance_disk_size = 100
+
+  # The VPC name in which the cluster will operate
+  eks_vpc_name = local.vpc_name
+
+  # The types of instances to use for the worker nodes
+  eks_instance_types = ["t3.xlarge", "m4.xlarge", "m5.xlarge"]
+
+  # How many worker nodes are desired
+  eks_ng_desired_size = 3
+
+  # What is the maximum number of worker nodes allowed.
+  eks_ng_max_size = 10
+
+  # What is the minimum number of worker nodes allowed.
+  eks_ng_min_size = 0
+
+  # Namespace to use for operator installation
+  operators_namespace = "operators"
+
+  ####################################################
+  ## Cloudwatch Agent Configuration for EKS
+  ####################################################
+  # Uses cluster_name and region
+
+  # The namespace that cloudwatch-agent and fluentbit will be installed.
+  cw_namespace = "cloudwatch"
+
+  # How long the logs will be maintained within cloudwatch before deletion.
+  cw_log_retention_days = "30"
+
+  # Fluent Bit reads log files from the tail, and will capture only new
+  # logs after it is deployed. If you want the opposite, set
+  # fluent_bit_read_from_head='On' and it will collect all logs in the
+  # file system and set fluent_bit_read_from_tail='Off'.
+  cw_fluent_bit_read_from_head = "off"
+  cw_fluent_bit_read_from_tail = "on"
+
+  # Fluent Bit can integrate with prometheus and serve metrics.  If the
+  # metrics server is desired, set this to "on" else set it to "off" to
+  # disable the metrics server
+  cw_fluent_bit_http_server = "on"
+
+  # When the metrics server is enabled, the port on which the server is to run.
+  cw_fluent_bit_http_port = "2020"
+
+  ####################################################
+  ## cert-manager Configuration
+  ####################################################
+  # Uses cluster_name and region
+
+  # The namespace that cert-manager will be installed.
+  cm_namespace = "cert-manager"
+
+  # The name of the cluster issuer to install
+  cm_cluster_issuer_name = "clusterissuer"
+
+  # How to issue certs:
+  # Intermediate CA - Request an intermediate CA from TCO and provide the
+  #   name of the file here:
+  #cm_intermediate_ca_crt = "./certs/pki.adsd-cumulus-sandbox.dev.csp1.census.gov.bundle.crt"
+  #cm_intermediate_ca_key = "./certs/pki.adsd-cumulus-sandbox.dev.csp1.census.gov.key"
+  #
+  # ACM - Use aws-pca-issuer to request leaf certs from AWS ACM.
+  cm_acm = true
+
+  ####################################################
+  ## Istio Configuration
+  ####################################################
+  # Uses cluster_name and region
+
+  # The namespace that Istio will be installed.
+  istio_namespace = "istio-system"
+
+  istio_enable_telemetry = true
+
+  # Potentially allow istio to control traffic outbound from the cluster.
+  istio_enable_egressgateway = true
+
+  ####################################################
+  ## Keycloak Configuration
+  ####################################################
+  # Uses cluster_name and region
+
+  keycloak_enabled = true
+
+  # The namespace that Keycloak will be installed.
+  keycloak_namespace = "keycloak"
+
+  # The email address of the person considered the keycloak administrator
+  keycloak_admin_email = "robel.t.fesshaye@census.gov"
+
+  # Details about the database keycloak should use to store configuration data
+  keycloak_db_vendor   = "postgresql"
+  keycloak_db_address  = "adsd-rds-mft-sbox.c2tx3ocukdth.us-gov-east-1.rds.amazonaws.com"
+  keycloak_db_port     = "5432"
+  keycloak_db_database = "keycloak"
+  keycloak_db_username = "keycloak"
+  keycloak_db_password = "a-secret-password"
+
+  ####################################################
+  ## log-trace-monitor configuration
+  ####################################################
+  log_trace_monitor_namespace        = "default"
+  log_trace_monitor_create_namespace = false
+
+  ####################################################
+  ## Kubernetes Dashboard configuration
+  ####################################################
+  # Uses cluster_name and region
+
+  # The namespace that kubernetes dashboard will be installed.
+  kube_dashboard_namespace = "kube-dashboard"
+
+  ####################################################
+  ## Metrics Server configuration
+  ####################################################
+  # Uses cluster_name and region
+
+  # The namespace that metrics-server will be installed.
+  ms_namespace = "kube-system"
+
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
index 3d61aaa..962d0ca 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
@@ -2,6 +2,10 @@ include "root" {
   path = find_in_parent_folders()
 }
 
+locals {
+  providers = ["kubernetes", "helm"]
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
   extra_arguments "retry_lock" {
@@ -35,33 +39,3 @@ inputs = {
   cert_manager-webhook_tag = "v1.15.1"
   namespace            = "cert-manager"
 }
-
-generate "provider-eks" {
-  path      = "provider-eks.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl
new file mode 100644
index 0000000..0214f2e
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cloudwatch/terragrunt.hcl
@@ -0,0 +1,27 @@
+include "root" {
+  path = find_in_parent_folders()
+}
+
+locals {
+  tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cloudwatch.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+}
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+inputs = {
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
index 265f094..51b37d7 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
@@ -4,10 +4,11 @@ include "root" {
 
 locals {
   tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=karpenter"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -31,33 +32,3 @@ inputs = {
   tag_costallocation                              = local.tag_costallocation
   region                                          = dependency.eks.inputs.region
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
index 571b345..35f3035 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
@@ -1,3 +1,7 @@
+locals {
+  providers = ["kubernetes", "helm"]
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
   extra_arguments "retry_lock" {
@@ -24,33 +28,3 @@ inputs = {
   # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
   rwo_storage_class  = dependency.eks-loki.outputs.rwo_storage_class
 }
-
-generate "provider-eks" {
-  path      = "provider-eks.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
index 7541125..10ea58f 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
@@ -3,6 +3,10 @@ include "root" {
   expose = true
 }
 
+locals {
+  providers = ["kubernetes", "helm"]
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=1.0.4"
   extra_arguments "retry_lock" {
@@ -16,7 +20,6 @@ dependency "eks" {
 }
 dependency "eks-config" {
   config_path  = "../eks-config"
-  skip_outputs = true
 }
 
 inputs = {
@@ -26,33 +29,3 @@ inputs = {
   istio_chart_version = "1.22.1"
   istio_version       = "1.22.1"
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
new file mode 100644
index 0000000..b02f3a4
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
@@ -0,0 +1,27 @@
+include "root" {
+  path = find_in_parent_folders()
+}
+
+locals {
+  tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+}
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+inputs = {
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl
new file mode 100644
index 0000000..8cf8288
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-kiali/terragrunt.hcl
@@ -0,0 +1,27 @@
+include "root" {
+  path = find_in_parent_folders()
+}
+
+locals {
+  tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+}
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+inputs = {
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
index 00f87f0..61417de 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
@@ -2,8 +2,12 @@ include "root" {
   path = find_in_parent_folders()
 }
 
+locals {
+  providers = ["kubernetes", "helm"]
+}
+
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=lokiv3"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -15,11 +19,9 @@ dependency "eks" {
 }
 dependency "eks-config" {
   config_path  = "../eks-config"
-  skip_outputs = true
 }
 dependency "eks-istio" {
   config_path  = "../eks-istio"
-  skip_outputs = true
 }
 
 inputs = {
@@ -28,33 +30,3 @@ inputs = {
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
   region            = dependency.eks.inputs.region
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
new file mode 100644
index 0000000..e01036d
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
@@ -0,0 +1,27 @@
+include "root" {
+  path = find_in_parent_folders()
+}
+
+locals {
+  tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+}
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+inputs = {
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
index 07a679b..22f3d96 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
@@ -2,6 +2,10 @@ include "root" {
   path = find_in_parent_folders()
 }
 
+locals {
+  providers = ["kubernetes", "helm"]
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
   extra_arguments "retry_lock" {
@@ -22,33 +26,3 @@ inputs = {
   cluster_name = dependency.eks.inputs.cluster_name
   region       = dependency.eks.inputs.region
 }
-
-generate "provider-eks" {
-  path      = "provider-eks.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
new file mode 100644
index 0000000..eb7a6dd
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
@@ -0,0 +1,27 @@
+include "root" {
+  path = find_in_parent_folders()
+}
+
+locals {
+  tag_costallocation = "census:csvd:platformbaseline"
+  providers = ["kubernetes", "helm"]
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+}
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+inputs = {
+
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
index 081ce28..8852060 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
@@ -21,6 +21,7 @@ locals {
   profile                                  = "224384469011-lab-dev-gov"
   region                                   = local.region_vars.locals.aws_region
   cluster_mailing_list                     = "matthew.c.morgan@census.gov"
+  providers = ["kubernetes", "helm"]
 
   # Tags applied to AWS objects created
   tags = {
@@ -79,35 +80,3 @@ inputs = {
   region                                   = local.region
   creator                                  = local.cluster_mailing_list
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  depends_on = [module.cluster.oidc_provider]
-  name = "${local.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  depends_on = [module.cluster.oidc_provider]
-  name = "${local.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
index 0b454f5..36b4205 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
@@ -14,22 +14,27 @@ locals {
   # vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl", "skip-account-if-does-not-exist"))
 
   # 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
+  account_name   = local.account_vars.locals.account_name
+  creator        = "matthew.c.morgan@census.gov"
   organization   = "census:ocio:csvd"
-  project_number = "fs0000000078"
+  profile        = "224384469011-lab-dev-gov"
   project_name   = "csvd_platformbaseline"
+  project_number = "fs0000000078"
   project_role   = "csvd_platformbaseline_mcm"
-  creator        = "matthew.c.morgan@census.gov"
-  profile        = "224384469011-lab-dev-gov"
+  region         = local.region_vars.locals.aws_region
+  providers = []
 }
 
 generate "provider" {
   path      = "provider.tf"
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
+terraform {
+  required_version = ">= 1.5.0"
+}
 provider "aws" {
-  region = "${local.region_vars.locals.aws_region}"
+  region = "${local.region}"
   profile = "${local.profile}"
   default_tags {
     tags = {
@@ -48,6 +53,29 @@ provider "aws" {
   # Only these AWS Account IDs may be operated on by this template
   allowed_account_ids = ["${local.account_id}"]
 }
+
+%{if contains(local.providers, "kubernetes") || contains(local.providers, "helm")}
+data "aws_eks_cluster" "cluster" {
+  name = "${local.config.cluster_name}"
+}
+data "aws_eks_cluster_auth" "cluster" {
+  name = "${local.config.cluster_name}"
+}
+provider "kubernetes" {
+  host = data.aws_eks_cluster.cluster.endpoint
+  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+  token                  = data.aws_eks_cluster_auth.cluster.token
+}
+%{endif}
+%{if contains(local.providers, "helm")}
+provider "helm" {
+  kubernetes {
+    host = data.aws_eks_cluster.cluster.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+    token                  = data.aws_eks_cluster_auth.cluster.token
+  }
+}
+%{endif}
 EOF
 }
 
@@ -58,9 +86,9 @@ remote_state {
     if_exists = "overwrite_terragrunt"
   }
   config = {
-    bucket         = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1"
+    bucket         = "v-s3-tg-tf-state-${local.account_name}-${local.region}"
     key            = "${local.project_number}/${local.project_name}/${local.project_role}/${path_relative_to_include()}/terraform.tfstate"
-    region         = local.region_vars.locals.aws_region
+    region         = local.region
     encrypt        = true
     dynamodb_table = "tf_remote_state"
   }