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
new file mode 100644
index 0000000..46d26d8
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
@@ -0,0 +1,30 @@
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+  mock_outputs = {
+    zone_ids = ["Z12345678CA5FV1LIFBC5"]
+  }
+}
+
+inputs = {
+  cluster_name    = dependency.eks.inputs.cluster_name
+  profile         = include.root.inputs.aws_profile
+  region          = include.root.inputs.aws_region
+  subnets         = dependency.eks.outputs.subnets
+  tags            = dependency.eks.inputs.tags
+  vpc_domain_name = dependency.eks.inputs.vpc_domain_name
+  vpc_id          = dependency.eks.outputs.vpc_id
+  vpc_name        = dependency.eks.inputs.vpc_name
+}
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 324ab9f..c136bd9 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
@@ -10,10 +10,8 @@ locals {
   cluster_name                             = "platform-eng-eks-mcm"
   cluster_version                          = "1.30"
   vpc_domain_name                          = include.root.inputs.vpc_domain_name
-  vpc_domain_name                          = include.root.inputs.vpc_domain_name
   eks_instance_disk_size                   = 100
   eks_vpc_name                             = include.root.inputs.vpc_name
-  eks_vpc_name                             = include.root.inputs.vpc_name
   eks_ng_desired_size                      = 2
   eks_ng_max_size                          = 10
   eks_ng_min_size                          = 2
@@ -22,17 +20,14 @@ locals {
   cluster_endpoint_public_access           = true
   profile                                  = include.root.inputs.aws_profile
   region                                   = include.root.inputs.aws_region
-  profile                                  = include.root.inputs.aws_profile
-  region                                   = include.root.inputs.aws_region
   cluster_mailing_list                     = "matthew.c.morgan@census.gov"
   environment_abbr                         = include.root.inputs.environment_abbr
-  environment_abbr                         = include.root.inputs.environment_abbr
 
   # 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}"
+    "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}"
   }
 
 }
@@ -46,14 +41,13 @@ terraform {
 }
 
 inputs = {
-  aws_account_id         = local.account_id
-  profile                = local.profile
-  vpc_name               = local.eks_vpc_name
-  cluster_name           = local.cluster_name
-  cluster_version        = local.cluster_version
-  eks_instance_disk_size = local.eks_instance_disk_size
-  eks_vpc_name           = local.eks_vpc_name
-  # eks_instance_types     = local.eks_instance_types
+  aws_account_id                           = local.account_id
+  profile                                  = local.profile
+  vpc_name                                 = local.eks_vpc_name
+  cluster_name                             = local.cluster_name
+  cluster_version                          = local.cluster_version
+  eks_instance_disk_size                   = local.eks_instance_disk_size
+  eks_vpc_name                             = local.eks_vpc_name
   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
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-dns/terragrunt.hcl
new file mode 100644
index 0000000..46d26d8
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-dns/terragrunt.hcl
@@ -0,0 +1,30 @@
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+  mock_outputs = {
+    zone_ids = ["Z12345678CA5FV1LIFBC5"]
+  }
+}
+
+inputs = {
+  cluster_name    = dependency.eks.inputs.cluster_name
+  profile         = include.root.inputs.aws_profile
+  region          = include.root.inputs.aws_region
+  subnets         = dependency.eks.outputs.subnets
+  tags            = dependency.eks.inputs.tags
+  vpc_domain_name = dependency.eks.inputs.vpc_domain_name
+  vpc_id          = dependency.eks.outputs.vpc_id
+  vpc_name        = dependency.eks.inputs.vpc_name
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks/terragrunt.hcl
index f2b65d1..90f7104 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks/terragrunt.hcl
@@ -25,10 +25,9 @@ locals {
 
   # Tags applied to AWS objects created
   tags = {
-    "eks-cluster-name" = local.cluster_name
-    "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}"
+    "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}"
   }
 
 }
@@ -42,14 +41,13 @@ terraform {
 }
 
 inputs = {
-  aws_account_id         = local.account_id
-  profile                = local.profile
-  vpc_name               = local.eks_vpc_name
-  cluster_name           = local.cluster_name
-  cluster_version        = local.cluster_version
-  eks_instance_disk_size = local.eks_instance_disk_size
-  eks_vpc_name           = local.eks_vpc_name
-  # eks_instance_types     = local.eks_instance_types
+  aws_account_id                           = local.account_id
+  profile                                  = local.profile
+  vpc_name                                 = local.eks_vpc_name
+  cluster_name                             = local.cluster_name
+  cluster_version                          = local.cluster_version
+  eks_instance_disk_size                   = local.eks_instance_disk_size
+  eks_vpc_name                             = local.eks_vpc_name
   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
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-dns/terragrunt.hcl
new file mode 100644
index 0000000..46d26d8
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-dns/terragrunt.hcl
@@ -0,0 +1,30 @@
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
+}
+
+dependency "eks" {
+  config_path = "../eks"
+  mock_outputs = {
+    zone_ids = ["Z12345678CA5FV1LIFBC5"]
+  }
+}
+
+inputs = {
+  cluster_name    = dependency.eks.inputs.cluster_name
+  profile         = include.root.inputs.aws_profile
+  region          = include.root.inputs.aws_region
+  subnets         = dependency.eks.outputs.subnets
+  tags            = dependency.eks.inputs.tags
+  vpc_domain_name = dependency.eks.inputs.vpc_domain_name
+  vpc_id          = dependency.eks.outputs.vpc_id
+  vpc_name        = dependency.eks.inputs.vpc_name
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks/terragrunt.hcl
index 13a37b8..f180390 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks/terragrunt.hcl
@@ -41,14 +41,13 @@ terraform {
 }
 
 inputs = {
-  aws_account_id         = local.account_id
-  profile                = local.profile
-  vpc_name               = local.eks_vpc_name
-  cluster_name           = local.cluster_name
-  cluster_version        = local.cluster_version
-  eks_instance_disk_size = local.eks_instance_disk_size
-  eks_vpc_name           = local.eks_vpc_name
-  # eks_instance_types     = local.eks_instance_types
+  aws_account_id                           = local.account_id
+  profile                                  = local.profile
+  vpc_name                                 = local.eks_vpc_name
+  cluster_name                             = local.cluster_name
+  cluster_version                          = local.cluster_version
+  eks_instance_disk_size                   = local.eks_instance_disk_size
+  eks_vpc_name                             = local.eks_vpc_name
   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
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl
deleted file mode 100644
index ac0a548..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl
+++ /dev/null
@@ -1,77 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
-  source = "../../../../../../../tfmod-kiali"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    cluster_name = "a-cluster-name"
-  }
-}
-dependency "eks-cert-manager" {
-  config_path = "../eks-cert-manager"
-  mock_outputs = {
-    cluster_issuer_name = "acmpca-clusterissuer"
-  }
-}
-dependency "eks-prometheus" {
-  config_path = "../eks-prometheus"
-  mock_outputs = {
-    prometheus_server_internal_endpoint = {
-      hostname    = "prometheus-server.prometheus.svc.cluster.local"
-      port_number = 9090
-      url         = "http://prometheus-server.prometheus.svc.cluster.local:9090/"
-    }
-  }
-}
-dependency "eks-grafana" {
-  config_path = "../eks-grafana"
-  mock_outputs = {
-    internal_endpoint = {
-      hostname    = "grafana.grafana.svc.cluster.local"
-      port_number = "80"
-      url         = "https://grafana.grafana.svc.cluster.local:80/"
-    }
-    namespace = "grafana"
-    public_endpoint = {
-      hostname    = "grafana.dev.lab.csp2.census.gov"
-      port_number = "80"
-      url         = "https://grafana.dev.lab.csp2.census.gov:80/"
-    }
-    secret_name = "grafana"
-  }
-}
-
-inputs = {
-  profile                 = include.root.inputs.aws_profile
-  cluster_domain          = dependency.eks.inputs.vpc_domain_name
-  operators_namespace     = dependency.eks.inputs.operators_ns
-  cluster_name            = dependency.eks.outputs.cluster_name
-  certificate_issuer      = dependency.eks-cert-manager.outputs.cluster_issuer_name
-  prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url
-  grafana_internal_url    = dependency.eks-grafana.outputs.internal_endpoint.url
-  grafana_namespace       = dependency.eks-grafana.outputs.namespace
-  grafana_public_url      = dependency.eks-grafana.outputs.public_endpoint.url
-  grafana_secret_name     = "grafana"
-  # grafana_secret_name     = dependency.eks-grafana.outputs.secret_name
-  jaeger_internal_url = ""
-
-
-  # client_id                  = var.sso_client_id
-  # client_secret              = var.sso_client_secret
-  # keycloak_public_url        = var.keycloak_public_url
-  # gogatekeeper_chart_version = var.gogatekeeper_chart_version
-  # gogatekeeper_registry      = var.gogatekeeper_registry
-  # gogatekeeper_repository    = var.gogatekeeper_repository
-  # gogatekeeper_tag           = var.gogatekeeper_tag
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
index 7f3d706..c52ffc3 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
@@ -32,6 +32,7 @@ dependency "eks-prometheus" {
 }
 
 inputs = {
+  aws_account_id       = include.root.inputs.aws_account_id
   profile              = include.root.inputs.aws_profile
   region               = include.root.inputs.aws_region
   cluster_name         = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable
deleted file mode 100644
index 7f3d706..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl.disable
+++ /dev/null
@@ -1,41 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=main"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    cluster_name      = "a-cluster-name"
-    oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
-  }
-}
-
-dependency "eks-prometheus" {
-  config_path = "../eks-prometheus"
-  mock_outputs = {
-    prometheus_server_internal_endpoint = {
-      hostname    = "prometheus-server.prometheus.svc.cluster.local"
-      port_number = 9090
-      url         = "http://prometheus-server.prometheus.svc.cluster.local:9090/"
-    }
-    prometheus_namespace = "prometheus"
-  }
-}
-
-inputs = {
-  profile              = include.root.inputs.aws_profile
-  region               = include.root.inputs.aws_region
-  cluster_name         = dependency.eks.outputs.cluster_name
-  oidc_provider_arn    = dependency.eks.outputs.oidc_provider_arn
-  prometheus_port      = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number
-  prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace
-}