diff --git a/.gitignore b/.gitignore
index 7c1cae9..4b51fc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,7 @@ override.tf.json
 .terraformrc
 terraform.rc
 
+# include tg stuff
+.terragrunt-cache/
+backend.tf
+provider*.tf
diff --git a/lab/us-gov-east-1/vpc/mcmCluster/.gitignore b/lab/us-gov-east-1/vpc/mcmCluster/.gitignore
deleted file mode 100644
index f8a9f3e..0000000
--- a/lab/us-gov-east-1/vpc/mcmCluster/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-backend.tf
-provider.tf
-.terragrunt-cache/
diff --git a/lab/us-gov-east-1/vpc/mcmCluster/eks-config/providers.tf b/lab/us-gov-east-1/vpc/mcmCluster/eks-config/providers.tf
deleted file mode 100644
index 7346788..0000000
--- a/lab/us-gov-east-1/vpc/mcmCluster/eks-config/providers.tf
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-provider "aws" {
-  profile = var.profile
-  region  = var.region
-}
-
-data "aws_eks_cluster" "cluster" {
-  name = var.cluster_name
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = var.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
-  }
-}
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 e130bf1..eca7f1b 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
@@ -34,3 +34,33 @@ inputs = {
   tag_costallocation                              = local.tag_costallocation
   region                                          = local.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/terragrunt.hcl b/lab/us-gov-east-1/vpc/mcmCluster/eks/terragrunt.hcl
index a8b6e9e..3d91b43 100644
--- a/lab/us-gov-east-1/vpc/mcmCluster/eks/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/mcmCluster/eks/terragrunt.hcl
@@ -6,27 +6,27 @@ include "root" {
 locals {
   region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
   # In which AWS region are operations being performed
-  vpc_name               = "vpc3-lab-dev"
-  cluster_name           = "platform-eng-eks-mcm"
-  cluster_version        = "1.30"
-  domain                 = "dev.lab.csp2.census.gov"
-  eks_instance_disk_size = 60
-  eks_vpc_name           = "vpc3-lab-dev"
-  eks_ng_desired_size    = 1
-  eks_ng_max_size        = 10
-  eks_ng_min_size        = 1
-  operators_ns           = "operators"
+  vpc_name                                 = "vpc3-lab-dev"
+  cluster_name                             = "platform-eng-eks-mcm"
+  cluster_version                          = "1.30"
+  domain                                   = "dev.lab.csp2.census.gov"
+  eks_instance_disk_size                   = 60
+  eks_vpc_name                             = "vpc3-lab-dev"
+  eks_ng_desired_size                      = 1
+  eks_ng_max_size                          = 10
+  eks_ng_min_size                          = 1
+  operators_ns                             = "operators"
   enable_cluster_creator_admin_permissions = true
-  cluster_endpoint_public_access  = true
-  profile                = "224384469011-lab-dev-gov"
-  region                 = local.region_vars.locals.aws_region
-  cluster_mailing_list   = "matthew.c.morgan@census.gov"
+  cluster_endpoint_public_access           = true
+  profile                                  = "224384469011-lab-dev-gov"
+  region                                   = local.region_vars.locals.aws_region
+  cluster_mailing_list                     = "matthew.c.morgan@census.gov"
 
   # Tags applied to AWS objects created
   tags = {
-      "Environment"           = "dev"
-      "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}"
+    "Environment"   = "dev"
+    "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}"
   }
 
   aws_auth_roles = [
@@ -52,7 +52,7 @@ locals {
 }
 
 terraform {
-  source      = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=lokiv3"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=lokiv3"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -67,15 +67,15 @@ inputs = {
   eks_instance_disk_size = local.eks_instance_disk_size
   eks_vpc_name           = local.eks_vpc_name
   #eks_instance_types     = local.eks_instance_types
-  eks_ng_desired_size    = local.eks_ng_desired_size
-  eks_ng_max_size        = local.eks_ng_max_size
-  eks_ng_min_size        = local.eks_ng_min_size
-  operators_ns           = local.operators_ns
+  eks_ng_desired_size                      = local.eks_ng_desired_size
+  eks_ng_max_size                          = local.eks_ng_max_size
+  eks_ng_min_size                          = local.eks_ng_min_size
+  operators_ns                             = local.operators_ns
   enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
-  cluster_endpoint_public_access  = local.cluster_endpoint_public_access 
-  tags                   = local.tags
-  aws_auth_roles         = local.aws_auth_roles
-  domain                 = local.domain
-  region                 = local.region
-  creator = local.cluster_mailing_list
+  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
+  tags                                     = local.tags
+  aws_auth_roles                           = local.aws_auth_roles
+  domain                                   = local.domain
+  region                                   = local.region
+  creator                                  = local.cluster_mailing_list
 }
diff --git a/terragrunt.hcl b/terragrunt.hcl
deleted file mode 100644
index c7e9f23..0000000
--- a/terragrunt.hcl
+++ /dev/null
@@ -1,72 +0,0 @@
-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")
-  // "${get_tfvars_dir()}/${find_in_parent_folders("account.tfvars", "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 region-level variables
-  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
- 
-  # Automatically load vpc-level variables
-  # Not applicable in this demo, but including for reference, would be next level of variables and configurations
-  # 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
-  organization   = "census:ocio:csvd"
-  project_number = "fs0000000078"
-  project_name   = "csvd_platformbaseline"
-  project_role   = "csvd_platformbaseline_app"
-}
-
-generate "provider" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-provider "aws" {
-  region = "us-gov-east-1"
-  default_tags {
-    tags = {
-      ProjectNumber = "${local.project_number}"
-      "Project Name" = "${local.project_name}"
-      "Project Role" = "${local.project_role}"
-      "Project Identifier" = "fs0000000078:csvd_platformbaseline"
-      Organization = "${local.organization}"
-      created_by = "srinivasa.nangunuri@census.gov"
-      created_for = "srinivasa.nangunuri@census.gov"
-      created_reason = "Exploration of Terragrunt and Demonstration of CICD for Infrastructure"
-      Terraform = "true"
-      Terragrunt = "true"
-    }
-  }
- 
-  # Only these AWS Account IDs may be operated on by this template
-  allowed_account_ids = ["${local.account_id}"]
-}
-EOF
-}
-
-remote_state {
-  backend     = "s3"
-  generate = {
-    path      = "backend.tf"
-    if_exists = "overwrite_terragrunt"
-  }
-  config = {
-    bucket         = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1"
-    key            = "platform-eks-test/terraform.tfstate"
-    region         = "us-gov-east-1"
-    encrypt        = true
-    #dynamodb_table = "my-lock-table"
-  }
-}
-
-inputs = merge(
-  # local.common_vars.locals,
-  local.account_vars.locals,
-  local.region_vars.locals,
-  #  local.vpc_vars.locals,
-)
\ No newline at end of file