diff --git a/lab/_envcommon/aws-provider.hcl b/lab/_envcommon/aws-provider.hcl
new file mode 100644
index 0000000..18483ac
--- /dev/null
+++ b/lab/_envcommon/aws-provider.hcl
@@ -0,0 +1,45 @@
+# lab/_envcommon/aws-provider.hcl
+
+include "root" {
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = false
+}
+
+# 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 = "~> ${include.root.inputs.tf_version}"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> ${include.root.inputs.aws_version}"
+    }
+  }
+  provider "aws" {
+    region = "${include.root.inputs.aws_region}"
+    profile = "${include.root.inputs.aws_profile}"
+    default_tags {
+      tags = {
+        "Project Identifier" = "${include.root.inputs.project_number}:${include.root.inputs.project_name}"
+        "Project Name" = "${include.root.inputs.project_name}"
+        "Project Role" = "${include.root.inputs.project_role}"
+        created_by = "${include.root.inputs.creator}"
+        created_for = "${include.root.inputs.creator}"
+        created_reason = "${include.root.inputs.created_reason}"
+        Environment = "${include.root.inputs.environment_abbr}"
+        Organization = "${include.root.inputs.organization}"
+        ProjectNumber = "${include.root.inputs.project_number}"
+        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..d2f73ef 100644
--- a/lab/_envcommon/common-variables.hcl
+++ b/lab/_envcommon/common-variables.hcl
@@ -1,11 +1,25 @@
+# lab/_envcommon/common-variables.hcl
+
 # ---------------------------------------------------------------------------------------------------------------------
 # GLOBAL PARAMETERS
 # These are the variables we pass to use across modules regardless of environment, i.e. these are the parameters 
 # 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
+  route53_endpoints = {
+    route53_main = {
+      "account_id"    = "269244441389"
+      "alias"         = "lab-gov-network-nonprod"
+      "us-gov-east-1" = "vpc-070595c5b133243dd"
+      "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1"
+    }
+  }
+}
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
new file mode 100644
index 0000000..6a147b5
--- /dev/null
+++ b/lab/_envcommon/default-versions.hcl
@@ -0,0 +1,107 @@
+# lab/_envcommon/default-versions.hcl
+
+locals {
+  #####################
+  # Module Versions
+  #####################
+  cluster_version            = "1.30"
+  custom_service_eks_account = "${local.release_version}"
+  eks_module_version         = "20.28.0"
+  istio_ingress_version      = "${local.release_version}"
+  release_version            = "0.1.1"
+
+  #####################
+  # TF Providers
+  #####################
+  aws_version        = "5.14.0"
+  helm_version       = "2.11.0"
+  kubernetes_version = "2.33.0"
+  null_version       = "3.2.1"
+  random_version     = "3.5.1"
+  template_version   = "2.2.0"
+  tf_version         = "1.5.0"
+
+  #####################
+  # EKS Config
+  #####################
+  kubectl_image_tag = "1.30.4"
+
+  ################
+  # k8s-dashboard
+  ################
+  dashboard_hostname            = "dashboard"
+  k8s_dashboard_metrics_scraper = "1.0.8"
+  k8s_dashboard_version         = "6.0.6"
+
+  ################
+  # Cert-Manager
+  ################
+  cluster_issuer_name              = "cert-manager"
+  cert_manager_cainjector_tag      = "v${local.cert_manager_version}"
+  cert_manager_controller_tag      = "v${local.cert_manager_version}"
+  cert_manager_helm_chart          = "${local.cert_manager_version}"
+  cert_manager_startupapicheck_tag = "v${local.cert_manager_version}"
+  cert_manager_version             = "1.16.1"
+  cert_manager_webhook_tag         = "v${local.cert_manager_version}"
+
+  ################
+  # Istio
+  ################
+  istio_version = "1.22.1"
+
+  ################
+  # Grafana
+  ################
+  download_dashboards_image_tag = "7.85.0"
+  grafana_chart_version         = "8.5.0"
+  grafana_hostname              = "grafana"
+  grafana_tag                   = "11.1.5"
+  init_chown_data_image_tag     = "1.31.1"
+
+  ################
+  # Karpenter
+  ################
+  karpenter_helm_chart = "1.0.6"
+  karpenter_tag        = "1.0.6"
+
+  ################
+  # Kiali
+  ################
+  kiali_operator_version    = "1.73.0"
+  kiali_application_version = "v${local.kiali_operator_version}"
+
+  ################
+  # Loki
+  ################
+  loki_chart_version              = "6.10.2"
+  loki_tag                        = "3.1.1"
+  canary_tag                      = "3.0.0"
+  enterprise_logs_provisioner_tag = "v1.7.0"
+  gateway_tag                     = "1.25.2-alpine"
+  memcached_tag                   = "1.6.23-alpine"
+  exporter_tag                    = "v0.14.4"
+  sidecar_tag                     = "1.27.4"
+
+  ################
+  # Metrics Server
+  ################
+  metrics_server_helm_chart = "3.12.1"
+  metrics_server_tag        = "v0.7.1"
+
+  ################
+  # Prometheus
+  ################
+  prometheus_chart_version       = "25.26.0"
+  prometheus_server_tag          = "v2.54.0"
+  prometheus_config_reloader_tag = "v0.75.2"
+  alertmanager_tag               = "v0.27.0"
+  kube_state_metrics_tag         = "v2.13.0"
+  node_exporter_tag              = "v1.8.2"
+  pushgateway_tag                = "v1.9.0"
+
+  ################
+  # Tempo
+  ################
+  tempo_chart_version = "1.10.3"
+  tempo_tag           = "2.5.0"
+}
diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
new file mode 100644
index 0000000..9de71e8
--- /dev/null
+++ b/lab/_envcommon/helm-provider.hcl
@@ -0,0 +1,46 @@
+# lab/_envcommon/helm-provider.hcl
+
+dependency "eks" {
+  config_path = "${get_original_terragrunt_dir()}/../eks"
+  mock_outputs = {
+    cluster_name = "a-cluster-name"
+  }
+}
+
+# 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 = "~> ${include.root.inputs.tf_version}"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> ${include.root.inputs.aws_version}"
+    }
+    helm = {
+      source  = "hashicorp/helm"
+      version = "~> ${include.root.inputs.helm_version}"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "~> ${include.root.inputs.kubernetes_version}"
+    }
+  }
+  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..a004d43
--- /dev/null
+++ b/lab/_envcommon/kubernetes-provider.hcl
@@ -0,0 +1,40 @@
+# lab/_envcommon/kubernetes-provider.hcl
+
+dependency "eks" {
+  config_path = "${get_original_terragrunt_dir()}/../eks"
+  mock_outputs = {
+    cluster_name = "a-cluster-name"
+  }
+}
+
+# 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 = "~> ${include.root.inputs.tf_version}"
+  }
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> ${include.root.inputs.aws_version}"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "~> ${include.root.inputs.kubernetes_version}"
+    }
+  }
+  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/account.hcl b/lab/development/account.hcl
index 1992080..80a8b3a 100644
--- a/lab/development/account.hcl
+++ b/lab/development/account.hcl
@@ -1,3 +1,5 @@
+# lab/development/account.hcl
+
 # Set account-wide variables. These are automatically pulled in to configure the remote state bucket in the root
 # terragrunt.hcl configuration. Terragrunt often segments account and environment, but given our strategy is to 
 # leverage accounts as environment boundaries, there is an anticipated 1:1 account to environment model that 
@@ -8,4 +10,4 @@ locals {
   aws_profile      = "224384469011-lab-dev-gov"
   environment      = "development"
   environment_abbr = "dev"
-}
\ No newline at end of file
+}
diff --git a/lab/development/us-gov-east-1/region.hcl b/lab/development/us-gov-east-1/region.hcl
index 4adfaa3..f87a8e6 100644
--- a/lab/development/us-gov-east-1/region.hcl
+++ b/lab/development/us-gov-east-1/region.hcl
@@ -1,5 +1,7 @@
+# lab/development/us-gov-east-1/region.hcl
+
 # Set common variables for the region. This is automatically pulled in in the root terragrunt.hcl configuration to
 # configure the remote state bucket and pass forward to the child modules as inputs.
 locals {
   aws_region = "us-gov-east-1"
-}
\ No newline at end of file
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-cert-manager/terragrunt.hcl
deleted file mode 100644
index ed589d6..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-cert-manager/terragrunt.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=0.1.1"
-  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 "karpenter" {
-#   config_path = "../eks-karpenter"
-#   skip_outputs = true
-# }
-
-inputs = {
-  cluster_name                     = dependency.eks.outputs.cluster_name
-  cluster_mailing_list             = dependency.eks.inputs.creator
-  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
-  profile                          = include.root.inputs.aws_profile
-  region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = "1.16.1"
-  cert_manager_cainjector_tag      = "v1.16.1"
-  cert_manager_controller_tag      = "v1.16.1"
-  cert_manager_startupapicheck_tag = "v1.16.1"
-  cert_manager_webhook_tag         = "v1.16.1"
-  cluster_issuer_name              = "cert-manager"
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-config/terragrunt.hcl
deleted file mode 100644
index d1b96dc..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-config/terragrunt.hcl
+++ /dev/null
@@ -1,42 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  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" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    vpc_id                                          = "a-vpc-id"
-    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"
-  }
-}
-
-inputs = {
-  profile                                         = include.root.inputs.aws_profile
-  region                                          = include.root.inputs.aws_region
-  vpc_id                                          = dependency.eks.outputs.vpc_id
-  cluster_name                                    = dependency.eks.outputs.cluster_name
-  subnets                                         = dependency.eks.outputs.subnets
-  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-cicd-test/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl
deleted file mode 100644
index 5b0d9d8..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-dns/terragrunt.hcl
+++ /dev/null
@@ -1,40 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=0.1.1"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    subnets = ["subnet-abcdefgh", "subnet-12345678", "subnet-ab12cd34"]
-  }
-}
-
-dependency "istio" {
-  config_path = "../eks-istio"
-  mock_outputs = {
-    istio_ingress_lb = {
-      dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
-      zone_id = "ZABC123456DEF"
-    }
-  }
-}
-
-inputs = {
-  cluster_name     = dependency.eks.inputs.cluster_name
-  istio_ingress_lb = dependency.istio.outputs.istio_ingress_lb
-  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_name         = dependency.eks.inputs.vpc_name
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-grafana/terragrunt.hcl
deleted file mode 100644
index ad41bce..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-grafana/terragrunt.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=0.1.1"
-  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-loki" {
-  config_path = "../eks-loki"
-  mock_outputs = {
-    rwo_storage_class = "gp3-encrypted"
-  }
-}
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
-
-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   = "grafana"
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-istio/terragrunt.hcl
deleted file mode 100644
index de80020..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-istio/terragrunt.hcl
+++ /dev/null
@@ -1,31 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=0.1.1"
-  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-karpenter" {
-  config_path  = "../eks-karpenter"
-  skip_outputs = true
-}
-
-inputs = {
-  profile             = include.root.inputs.aws_profile
-  region              = include.root.inputs.aws_region
-  cluster_name        = dependency.eks.outputs.cluster_name
-  istio_chart_version = "1.22.1"
-  istio_version       = "1.22.1"
-}
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
deleted file mode 100644
index 9fbed89..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-k8s-dashboard/terragrunt.hcl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=0.1.1"
-  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"
-    vpc_domain_name = "example.com"
-  }
-}
-
-dependency "eks-loki" {
-  config_path  = "../eks-loki"
-  skip_outputs = true
-}
-
-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"
-  # 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-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-karpenter/terragrunt.hcl
deleted file mode 100644
index 8ae33c1..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-karpenter/terragrunt.hcl
+++ /dev/null
@@ -1,38 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=0.1.1"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    cluster_endpoint  = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com"
-    cluster_name      = "a-cluster-name"
-    node_group_name   = "node_group_a-cluster-name"
-    oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
-    vpc_id            = "a-vpc-name"
-  }
-}
-
-dependency "eks-config" {
-  config_path  = "../eks-config"
-  skip_outputs = true
-}
-
-inputs = {
-  profile                   = include.root.inputs.aws_profile
-  region                    = include.root.inputs.aws_region
-  cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
-  cluster_name              = dependency.eks.outputs.cluster_name
-  karpenter_node_group_name = dependency.eks.outputs.node_group_name
-  oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
-  vpc_id                    = dependency.eks.outputs.vpc_id
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-loki/terragrunt.hcl
deleted file mode 100644
index a20f01d..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-loki/terragrunt.hcl
+++ /dev/null
@@ -1,35 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=0.1.1"
-  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-istio" {
-  config_path  = "../eks-istio"
-  skip_outputs = true
-}
-dependency "eks-prometheus" {
-  config_path  = "../eks-prometheus"
-  skip_outputs = true
-}
-
-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
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-metrics-server/terragrunt.hcl
deleted file mode 100644
index 5d9c5b7..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-metrics-server/terragrunt.hcl
+++ /dev/null
@@ -1,25 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=0.1.1"
-  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"
-  }
-}
-
-inputs = {
-  profile      = include.root.inputs.aws_profile
-  cluster_name = dependency.eks.outputs.cluster_name
-  region       = include.root.inputs.aws_region
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/README.md b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/README.md
deleted file mode 100644
index bbbffb2..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/README.md
+++ /dev/null
@@ -1,198 +0,0 @@
-## eks-prometheus
-This module deploys EKS kubeenetes prometheus inside existing EKS cluster. Prometheus is an open-source systems monitoring and alerting tool.
-This module consisits of 4 components. It creates prometheus namespace and  copies image repositories for the following components from quay.io into local account ECR repository. It deploys these components using helm charts using the configured ECR repositories.
-    1. prometheus-alert-manager
-    2. prometheus-node-exporter
-    3. prometheus-pushgateway
-    4. prometheus-server
-
-### Dependencies
-This module is dependent on EKS module (eks). The cluster should exist already for this module to work.
-
-### Inputs
-    cluster_name
-    profile
-    prometheus_chart_version
-    prometheus_server_tag
-    prometheus_config_reloader_tag
-    alertmanager_tag
-    kube_state_metrics_tag
-    node_exporter_tag
-    pushgateway_tag
-    rwo_storage_class
-
-### Outputs
-    alertmanager_internal_endpoint
-    alertmanager_headless_internal_endpoint
-    pushgateway_internal_endpoint
-    prometheus_server_internal_endpoint
-
-### Issues observed/fixed
-1. The rwo_storage_class value had to be updated from "gp3" to "gp3-encrypted"
-2. The node_exporter_tag value had to be updated from "1.6.1" to "v1.8.1"
-3. The kube_state_metrics_tag value had to be updated from "2.10.0" to "v2.6.0"
-4. The alertmanager_tag value had to be updated from
-5. The helm chart set config for the ecr image had to be split into 2 components, one for registry and other for repository as an example mentioned below:
-
-    ```
-    set {
-    name = "kube-state-metrics.image.registry"
-    value = module.images.images[local.ksm_key].dest_registry
-  }
-  set {
-    name = "kube-state-metrics.image.repository"
-    value = module.images.images[local.ksm_key].dest_repository
-      }
-    ```
-
-6. In some other cases the image ecr repository had to be split by the colon separatory (:)
-
-    ```
-    set {
-    name = "alertmanager.configmapReload.image.repository"
-    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
-        }
-    ```
-
-### Chart Notes
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus-pushgateway,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl port-forward $POD_NAME 9091
-        echo "Visit http://127.0.0.1:9091 to use your application"
-    ```
-
-    The Prometheus server can be accessed via port 80 on the following DNS name from within your cluster:
-    prometheus-server.prometheus.svc.cluster.local
-
-
-    Get the Prometheus server URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9090
-    ```
-
-    The Prometheus alertmanager can be accessed via port 9093 on the following DNS name from within your cluster:
-    `prometheus-alertmanager.prometheus.svc.cluster.local`
-
-
-    Get the Alertmanager URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=alertmanager,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9093
-    ```
-
-    #################################################################################
-    ######   WARNING: Pod Security Policy has been disabled by default since    #####
-    ######            it deprecated after k8s 1.25+. use                        #####
-    ######            (index .Values "prometheus-node-exporter" "rbac"          #####
-    ######            "pspEnabled") with (index .Values                         #####
-    ######            "prometheus-node-exporter" "rbac" "pspAnnotations")       #####
-    ######            in case you still need it.                                #####
-    #################################################################################
-
-
-    The Prometheus PushGateway can be accessed via port 9091 on the following DNS name from within your cluster:
-    `prometheus-prometheus-pushgateway.prometheus.svc.cluster.local`
-
-
-    Get the PushGateway URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app=prometheus-pushgateway,component=pushgateway" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9091
-    ```
-
-    For more information on running Prometheus, visit:
-    https://prometheus.io/
-
-    kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
-    The exposed metrics can be found here:
-    https://github.com/kubernetes/kube-state-metrics/blob/master/docs/README.md#exposed-metrics
-
-    The metrics are exported on the HTTP endpoint /metrics on the listening port.
-    In your case, `prometheus-kube-state-metrics.prometheus.svc.cluster.local:8080/metrics`
-
-    They are served either as plaintext or protobuf depending on the Accept header.
-    They are designed to be consumed either by Prometheus itself or by a scraper that is compatible with scraping a Prometheus client endpoint.
-
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=alertmanager,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        echo "Visit http://127.0.0.1:9093 to use your application"
-        kubectl --namespace prometheus port-forward $POD_NAME 9093:80
-    ```
-
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus-node-exporter,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        echo "Visit http://127.0.0.1:9100 to use your application"
-        kubectl port-forward --namespace prometheus $POD_NAME 9100
-    ```
-
-<!--BEGIN-TF-DOCS-->
-## Requirements
-
-| Name | Version |
-|------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.14.0 |
-| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.11.0 |
-| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.23.0 |
-| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
-
-## Providers
-
-| Name | Version |
-|------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.11.0 |
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.23.0 |
-
-## Modules
-
-| Name | Source | Version |
-|------|--------|---------|
-| <a name="module_images"></a> [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade |
-
-## Resources
-
-| Name | Type |
-|------|------|
-| [helm_release.prometheus](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
-| [kubernetes_namespace.ns](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
-| [kubernetes_namespace.existing-ns](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/namespace) | data source |
-
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| <a name="input_alertmanager_tag"></a> [alertmanager\_tag](#input\_alertmanager\_tag) | The image tag of the alertmanager image. | `string` | `"v0.27.0"` | no |
-| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the cluster into which prometheus will be installed. | `string` | n/a | yes |
-| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Indicates whether the `namespace` needs to be created ('true') or already exists (not `true`) | `bool` | `true` | no |
-| <a name="input_kube_state_metrics_tag"></a> [kube\_state\_metrics\_tag](#input\_kube\_state\_metrics\_tag) | The image tag of the kube-state-metrics image. | `string` | `"v2.13.0"` | no |
-| <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace to install the prometheus components. Defaults to 'prometheus' | `string` | `"prometheus"` | no |
-| <a name="input_node_exporter_tag"></a> [node\_exporter\_tag](#input\_node\_exporter\_tag) | The image tag of the node-exporter image. | `string` | `"v1.8.2"` | no |
-| <a name="input_profile"></a> [profile](#input\_profile) | AWS\_PROFILE to use to apply the terraform script. | `string` | `""` | no |
-| <a name="input_prometheus_chart_version"></a> [prometheus\_chart\_version](#input\_prometheus\_chart\_version) | The version of prometheus to install into the cluster. | `string` | `"25.24.1"` | no |
-| <a name="input_prometheus_config_reloader_tag"></a> [prometheus\_config\_reloader\_tag](#input\_prometheus\_config\_reloader\_tag) | The image tag of the prometheus-config-reloader image. | `string` | `"v0.75.1"` | no |
-| <a name="input_prometheus_server_tag"></a> [prometheus\_server\_tag](#input\_prometheus\_server\_tag) | The image tag of prometheus server to install into the cluster. | `string` | `"v2.53.1"` | no |
-| <a name="input_pushgateway_tag"></a> [pushgateway\_tag](#input\_pushgateway\_tag) | The image tag of the pushgateway image. | `string` | `"v1.9.0"` | no |
-| <a name="input_rwo_storage_class"></a> [rwo\_storage\_class](#input\_rwo\_storage\_class) | Specify the storage class for read/write/once persistent volumes. | `string` | `"gp3-encrypted"` | no |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| <a name="output_alertmanager_headless_internal_endpoint"></a> [alertmanager\_headless\_internal\_endpoint](#output\_alertmanager\_headless\_internal\_endpoint) | n/a |
-| <a name="output_alertmanager_internal_endpoint"></a> [alertmanager\_internal\_endpoint](#output\_alertmanager\_internal\_endpoint) | n/a |
-| <a name="output_module_name"></a> [module\_name](#output\_module\_name) | The name of this module. |
-| <a name="output_module_version"></a> [module\_version](#output\_module\_version) | The version of this module. |
-| <a name="output_prometheus_namespace"></a> [prometheus\_namespace](#output\_prometheus\_namespace) | n/a |
-| <a name="output_prometheus_server_internal_endpoint"></a> [prometheus\_server\_internal\_endpoint](#output\_prometheus\_server\_internal\_endpoint) | n/a |
-| <a name="output_pushgateway_internal_endpoint"></a> [pushgateway\_internal\_endpoint](#output\_pushgateway\_internal\_endpoint) | n/a |
-<!--END-TF-DOCS-->
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/terragrunt.hcl
deleted file mode 100644
index 4d4e9fc..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-prometheus/terragrunt.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=0.1.1"
-  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-dns" {
-  config_path  = "../eks-dns"
-  skip_outputs = true
-}
-
-inputs = {
-  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-eng-cicd-test/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-tempo/terragrunt.hcl
deleted file mode 100644
index 4f290f8..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-tempo/terragrunt.hcl
+++ /dev/null
@@ -1,42 +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=0.1.1"
-  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 = {
-  account_id           = include.root.locals.account_id
-  profile              = include.root.locals.aws_profile
-  region               = include.root.locals.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
-}
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
deleted file mode 100644
index 4cf7f5f..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks/terragrunt.hcl
+++ /dev/null
@@ -1,103 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  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-cicd-test"
-  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
-  eks_vpc_name                             = include.root.inputs.vpc_name
-  enable_cluster_creator_admin_permissions = true
-  environment_abbr                         = include.root.inputs.environment_abbr
-  organization                             = include.root.inputs.organization
-  profile                                  = include.root.inputs.aws_profile
-  project_name                             = include.root.inputs.project_name
-  project_number                           = include.root.inputs.project_number
-  project_role                             = include.root.inputs.project_role
-  region                                   = include.root.inputs.aws_region
-  terraform                                = true
-  terragrunt                               = true
-  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 {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=0.1.1"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-# 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
-  cluster_name                             = local.cluster_name
-  cluster_version                          = local.cluster_version
-  creator                                  = local.creator
-  eks_instance_disk_size                   = local.eks_instance_disk_size
-  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
-  eks_vpc_name                             = local.eks_vpc_name
-  enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
-  os_username                              = local.creator
-  shared_vpc_label                         = local.environment_abbr
-  tags                                     = local.tags
-}
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..98d12d7
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
@@ -0,0 +1,24 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
+
+# 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"
+  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
+  terraform                                = true
+  terragrunt                               = true
+  tags = {
+    "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}"
+  }
+  eks_version = "0.1.1"
+  eks_enabled = true
+
+
+}
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..35e355a 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -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
@@ -30,10 +31,10 @@ inputs = {
   oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
   profile                          = include.root.inputs.aws_profile
   region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = "1.16.1"
-  cert_manager_cainjector_tag      = "v1.16.1"
-  cert_manager_controller_tag      = "v1.16.1"
-  cert_manager_startupapicheck_tag = "v1.16.1"
-  cert_manager_webhook_tag         = "v1.16.1"
-  cluster_issuer_name              = "cert-manager"
+  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
+  cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
+  cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
+  cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
+  cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
+  cluster_issuer_name              = include.root.inputs.cluster_issuer_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..d4a60db 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,14 +1,13 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  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"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,12 +17,15 @@ 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"
   }
 }
 
@@ -36,7 +38,5 @@ 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
+  kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
 }
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..6e28781 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -23,18 +24,19 @@ dependency "istio" {
   mock_outputs = {
     istio_ingress_lb = {
       dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
-      zone_id = "ZABC123456DEF"
+      zone_id  = "ZABC123456DEF"
     }
   }
 }
 
 inputs = {
-  cluster_name     = dependency.eks.inputs.cluster_name
-  istio_ingress_lb = dependency.istio.outputs.istio_ingress_lb
-  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_name         = dependency.eks.inputs.vpc_name
+  cluster_name      = dependency.eks.inputs.cluster_name
+  istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
+  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_name          = dependency.eks.inputs.vpc_name
+  route53_endpoints = include.root.inputs.route53_endpoints
 }
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..65ab33f 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -17,23 +18,23 @@ dependency "eks" {
     cluster_name = "a-cluster-name"
   }
 }
+
 dependency "eks-loki" {
   config_path = "../eks-loki"
   mock_outputs = {
     rwo_storage_class = "gp3-encrypted"
   }
 }
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
 
 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   = "grafana"
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+  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               = include.root.inputs.grafana_hostname
+  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
+  grafana_chart_version         = include.root.inputs.grafana_chart_version
+  grafana_tag                   = include.root.inputs.grafana_tag
+  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
+  init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
 }
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..c7c22c8 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -26,6 +27,6 @@ inputs = {
   profile             = include.root.inputs.aws_profile
   region              = include.root.inputs.aws_region
   cluster_name        = dependency.eks.outputs.cluster_name
-  istio_chart_version = "1.22.1"
-  istio_version       = "1.22.1"
+  istio_chart_version = include.root.inputs.istio_version
+  istio_version       = include.root.inputs.istio_version
 }
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..cd1961b 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,11 +1,11 @@
-
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -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       = include.root.inputs.dashboard_hostname
+  k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
   # 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..6b1a862 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -35,4 +36,8 @@ inputs = {
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
   vpc_id                    = dependency.eks.outputs.vpc_id
+  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
+  karpenter_tag             = include.root.inputs.karpenter_tag
+  kubectl_tag               = include.root.inputs.kubectl_image_tag
+
 }
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..1e04fe0 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,10 +1,11 @@
 include "root" {
-  path = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
   # source = "../../../../../../../tfmod-kiali"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
@@ -53,6 +54,9 @@ dependency "eks-grafana" {
 }
 
 inputs = {
+  kiali_operator_version = include.root.inputs.kiali_operator_version
+  kiali_application_version = include.root.inputs.kiali_application_version
+
   profile                 = include.root.inputs.aws_profile
   cluster_domain          = dependency.eks.inputs.vpc_domain_name
   operators_namespace     = "operators"
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..2c6b6be 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -28,8 +29,16 @@ dependency "eks-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
+  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
+  loki_chart_version              = include.root.inputs.loki_chart_version
+  loki_tag                        = include.root.inputs.loki_tag
+  canary_tag                      = include.root.inputs.canary_tag
+  enterprise_logs_provisioner_tag = include.root.inputs.enterprise_logs_provisioner_tag
+  gateway_tag                     = include.root.inputs.gateway_tag
+  memcached_tag                   = include.root.inputs.memcached_tag
+  exporter_tag                    = include.root.inputs.exporter_tag
+  sidecar_tag                     = include.root.inputs.sidecar_tag
 }
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..387653b 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,8 +19,15 @@ 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
-  region       = include.root.inputs.aws_region
+  profile                   = include.root.inputs.aws_profile
+  cluster_name              = dependency.eks.outputs.cluster_name
+  region                    = include.root.inputs.aws_region
+  metrics_server_helm_chart = include.root.inputs.metrics_server_helm_chart
+  metrics_server_tag        = include.root.inputs.metrics_server_tag
 }
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..e6c54b1 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -24,7 +25,14 @@ dependency "eks-dns" {
 }
 
 inputs = {
-  profile      = include.root.inputs.aws_profile
-  region       = include.root.inputs.aws_region
-  cluster_name = dependency.eks.outputs.cluster_name
+  profile                        = include.root.inputs.aws_profile
+  region                         = include.root.inputs.aws_region
+  cluster_name                   = dependency.eks.outputs.cluster_name
+  prometheus_chart_version       = include.root.inputs.prometheus_chart_version
+  prometheus_server_tag          = include.root.inputs.prometheus_server_tag
+  prometheus_config_reloader_tag = include.root.inputs.prometheus_config_reloader_tag
+  alertmanager_tag               = include.root.inputs.alertmanager_tag
+  kube_state_metrics_tag         = include.root.inputs.kube_state_metrics_tag
+  node_exporter_tag              = include.root.inputs.node_exporter_tag
+  pushgateway_tag                = include.root.inputs.pushgateway_tag
 }
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..e9ebd48 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,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -39,4 +40,7 @@ inputs = {
   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
+  tempo_chart_version  = include.root.inputs.tempo_chart_version
+  tempo_tag            = include.root.inputs.tempo_tag
+
 }
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..cc7c893 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,68 +24,20 @@ 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 {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
   }
 }
 
-# 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-test/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/cluster.hcl
new file mode 100644
index 0000000..8d2831c
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/cluster.hcl
@@ -0,0 +1,20 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
+
+# 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"
+  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
+  terraform                                = true
+  terragrunt                               = true
+  tags = {
+    "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-test/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-cert-manager/terragrunt.hcl
index 1448ac8..35e355a 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-cert-manager/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-cert-manager/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -19,16 +20,21 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path  = "../eks-config"
+  skip_outputs = true
+}
+
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
   cluster_mailing_list             = dependency.eks.inputs.creator
   oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
   profile                          = include.root.inputs.aws_profile
   region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = "1.15.1"
-  cert_manager_cainjector_tag      = "v1.15.1"
-  cert_manager_controller_tag      = "v1.15.1"
-  cert_manager_startupapicheck_tag = "v1.15.1"
-  cert_manager_webhook_tag         = "v1.15.1"
-  cluster_issuer_name              = "cert-manager"
+  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
+  cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
+  cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
+  cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
+  cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
+  cluster_issuer_name              = include.root.inputs.cluster_issuer_name
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-config/terragrunt.hcl
index 84bb1ff..d4a60db 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-config/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-config/terragrunt.hcl
@@ -1,14 +1,13 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  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=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,12 +17,15 @@ 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"
   }
 }
 
@@ -36,7 +38,5 @@ 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
+  kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
 }
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
index 46d26d8..6e28781 100644
--- 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
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -14,17 +15,28 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
-    zone_ids = ["Z12345678CA5FV1LIFBC5"]
+    subnets = ["subnet-abcdefgh", "subnet-12345678", "subnet-ab12cd34"]
+  }
+}
+
+dependency "istio" {
+  config_path = "../eks-istio"
+  mock_outputs = {
+    istio_ingress_lb = {
+      dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
+      zone_id  = "ZABC123456DEF"
+    }
   }
 }
 
 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
+  cluster_name      = dependency.eks.inputs.cluster_name
+  istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
+  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_name          = dependency.eks.inputs.vpc_name
+  route53_endpoints = include.root.inputs.route53_endpoints
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-grafana/terragrunt.hcl
index c2172e8..65ab33f 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-grafana/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-grafana/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -17,22 +18,23 @@ dependency "eks" {
     cluster_name = "a-cluster-name"
   }
 }
+
 dependency "eks-loki" {
   config_path = "../eks-loki"
   mock_outputs = {
     rwo_storage_class = "gp3-encrypted"
   }
 }
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
 
 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
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+  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               = include.root.inputs.grafana_hostname
+  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
+  grafana_chart_version         = include.root.inputs.grafana_chart_version
+  grafana_tag                   = include.root.inputs.grafana_tag
+  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
+  init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-istio/terragrunt.hcl
index 5a30c0e..c7c22c8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-istio/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-istio/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -26,6 +27,6 @@ inputs = {
   profile             = include.root.inputs.aws_profile
   region              = include.root.inputs.aws_region
   cluster_name        = dependency.eks.outputs.cluster_name
-  istio_chart_version = "1.22.1"
-  istio_version       = "1.22.1"
+  istio_chart_version = include.root.inputs.istio_version
+  istio_version       = include.root.inputs.istio_version
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-k8s-dashboard/terragrunt.hcl
new file mode 100644
index 0000000..cd1961b
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-k8s-dashboard/terragrunt.hcl
@@ -0,0 +1,36 @@
+include "root" {
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}"
+  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"
+    vpc_domain_name = "example.com"
+  }
+}
+
+dependency "eks-loki" {
+  config_path  = "../eks-loki"
+  skip_outputs = true
+}
+
+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       = include.root.inputs.dashboard_hostname
+  k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
+  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-karpenter/terragrunt.hcl
index 982e1d7..6b1a862 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-karpenter/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-karpenter/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -35,4 +36,8 @@ inputs = {
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
   vpc_id                    = dependency.eks.outputs.vpc_id
+  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
+  karpenter_tag             = include.root.inputs.karpenter_tag
+  kubectl_tag               = include.root.inputs.kubectl_image_tag
+
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-kiali/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-kiali/terragrunt.hcl.disable
similarity index 89%
rename from lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-kiali/terragrunt.hcl.disable
rename to lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-kiali/terragrunt.hcl.disable
index d129107..1e04fe0 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-cicd-test/eks-kiali/terragrunt.hcl.disable
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-kiali/terragrunt.hcl.disable
@@ -1,10 +1,11 @@
 include "root" {
-  path = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=v0.1.1"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
   # source = "../../../../../../../tfmod-kiali"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
@@ -53,6 +54,9 @@ dependency "eks-grafana" {
 }
 
 inputs = {
+  kiali_operator_version = include.root.inputs.kiali_operator_version
+  kiali_application_version = include.root.inputs.kiali_application_version
+
   profile                 = include.root.inputs.aws_profile
   cluster_domain          = dependency.eks.inputs.vpc_domain_name
   operators_namespace     = "operators"
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-loki/terragrunt.hcl
index cc94f7f..2c6b6be 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-loki/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-loki/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -22,10 +23,22 @@ dependency "eks-istio" {
   config_path  = "../eks-istio"
   skip_outputs = true
 }
+dependency "eks-prometheus" {
+  config_path  = "../eks-prometheus"
+  skip_outputs = true
+}
 
 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
+  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
+  loki_chart_version              = include.root.inputs.loki_chart_version
+  loki_tag                        = include.root.inputs.loki_tag
+  canary_tag                      = include.root.inputs.canary_tag
+  enterprise_logs_provisioner_tag = include.root.inputs.enterprise_logs_provisioner_tag
+  gateway_tag                     = include.root.inputs.gateway_tag
+  memcached_tag                   = include.root.inputs.memcached_tag
+  exporter_tag                    = include.root.inputs.exporter_tag
+  sidecar_tag                     = include.root.inputs.sidecar_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-metrics-server/terragrunt.hcl
index 5414a72..387653b 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-metrics-server/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-metrics-server/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,8 +19,15 @@ 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
-  region       = include.root.inputs.aws_region
+  profile                   = include.root.inputs.aws_profile
+  cluster_name              = dependency.eks.outputs.cluster_name
+  region                    = include.root.inputs.aws_region
+  metrics_server_helm_chart = include.root.inputs.metrics_server_helm_chart
+  metrics_server_tag        = include.root.inputs.metrics_server_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-prometheus/terragrunt.hcl
index 62611b1..e6c54b1 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-prometheus/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-prometheus/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,13 +19,20 @@ dependency "eks" {
   }
 }
 
-dependency "eks-istio" {
-  config_path  = "../eks-istio"
+dependency "eks-dns" {
+  config_path  = "../eks-dns"
   skip_outputs = true
 }
 
 inputs = {
-  profile      = include.root.inputs.aws_profile
-  region       = include.root.inputs.aws_region
-  cluster_name = dependency.eks.outputs.cluster_name
+  profile                        = include.root.inputs.aws_profile
+  region                         = include.root.inputs.aws_region
+  cluster_name                   = dependency.eks.outputs.cluster_name
+  prometheus_chart_version       = include.root.inputs.prometheus_chart_version
+  prometheus_server_tag          = include.root.inputs.prometheus_server_tag
+  prometheus_config_reloader_tag = include.root.inputs.prometheus_config_reloader_tag
+  alertmanager_tag               = include.root.inputs.alertmanager_tag
+  kube_state_metrics_tag         = include.root.inputs.kube_state_metrics_tag
+  node_exporter_tag              = include.root.inputs.node_exporter_tag
+  pushgateway_tag                = include.root.inputs.pushgateway_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-tempo/terragrunt.hcl
index 7f3d706..e9ebd48 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-tempo/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -32,10 +33,14 @@ dependency "eks-prometheus" {
 }
 
 inputs = {
-  profile              = include.root.inputs.aws_profile
-  region               = include.root.inputs.aws_region
+  account_id           = include.root.locals.account_id
+  profile              = include.root.locals.aws_profile
+  region               = include.root.locals.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
+  tempo_chart_version  = include.root.inputs.tempo_chart_version
+  tempo_tag            = include.root.inputs.tempo_tag
+
 }
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 90f7104..cc7c893 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
@@ -1,39 +1,37 @@
 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
-  vpc_name                                 = include.root.inputs.vpc_name
-  cluster_name                             = "platform-eng-eks-test"
-  cluster_version                          = "1.30"
-  vpc_domain_name                          = include.root.inputs.vpc_domain_name
-  eks_instance_disk_size                   = 100
+  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
-  eks_ng_desired_size                      = 2
-  eks_ng_max_size                          = 10
-  eks_ng_min_size                          = 2
-  operators_ns                             = "operators"
-  enable_cluster_creator_admin_permissions = true
-  cluster_endpoint_public_access           = 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
+  project_name                             = include.root.inputs.project_name
+  project_number                           = include.root.inputs.project_number
+  project_role                             = include.root.inputs.project_role
   region                                   = include.root.inputs.aws_region
-  cluster_mailing_list                     = "srinivasa.nangunuri@census.gov"
-  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}"
-  }
-
+  tags                                     = include.root.inputs.tags
+  terraform                                = include.root.inputs.terraform
+  terragrunt                               = include.root.inputs.terragrunt
+  vpc_domain_name                          = include.root.inputs.vpc_domain_name
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -42,22 +40,17 @@ terraform {
 
 inputs = {
   aws_account_id                           = local.account_id
-  profile                                  = local.profile
-  vpc_name                                 = local.eks_vpc_name
+  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
   cluster_name                             = local.cluster_name
   cluster_version                          = local.cluster_version
+  creator                                  = local.creator
   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
-  operators_ns                             = local.operators_ns
+  eks_vpc_name                             = local.eks_vpc_name
   enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
-  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
-  tags                                     = local.tags
-  vcp_domain_name                          = local.vpc_domain_name
-  region                                   = local.region
-  creator                                  = local.cluster_mailing_list
-  os_username                              = local.cluster_mailing_list
+  os_username                              = local.creator
   shared_vpc_label                         = local.environment_abbr
+  tags                                     = local.tags
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/cluster.hcl
new file mode 100644
index 0000000..8d2831c
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/cluster.hcl
@@ -0,0 +1,20 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
+
+# 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"
+  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
+  terraform                                = true
+  terragrunt                               = true
+  tags = {
+    "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-test-cicd/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-cert-manager/terragrunt.hcl
index 1448ac8..35e355a 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-cert-manager/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-cert-manager/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -19,16 +20,21 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path  = "../eks-config"
+  skip_outputs = true
+}
+
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
   cluster_mailing_list             = dependency.eks.inputs.creator
   oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
   profile                          = include.root.inputs.aws_profile
   region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = "1.15.1"
-  cert_manager_cainjector_tag      = "v1.15.1"
-  cert_manager_controller_tag      = "v1.15.1"
-  cert_manager_startupapicheck_tag = "v1.15.1"
-  cert_manager_webhook_tag         = "v1.15.1"
-  cluster_issuer_name              = "cert-manager"
+  cert_manager_helm_chart          = include.root.inputs.cert_manager_helm_chart
+  cert_manager_cainjector_tag      = include.root.inputs.cert_manager_cainjector_tag
+  cert_manager_controller_tag      = include.root.inputs.cert_manager_controller_tag
+  cert_manager_startupapicheck_tag = include.root.inputs.cert_manager_startupapicheck_tag
+  cert_manager_webhook_tag         = include.root.inputs.cert_manager_webhook_tag
+  cluster_issuer_name              = include.root.inputs.cluster_issuer_name
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-config/terragrunt.hcl
index 84bb1ff..d4a60db 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-config/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-config/terragrunt.hcl
@@ -1,14 +1,13 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
+
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  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=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,12 +17,15 @@ 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"
   }
 }
 
@@ -36,7 +38,5 @@ 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
+  kubectl_image_tag                               = include.root.inputs.kubectl_image_tag
 }
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
index 46d26d8..6e28781 100644
--- 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
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -14,17 +15,28 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
   mock_outputs = {
-    zone_ids = ["Z12345678CA5FV1LIFBC5"]
+    subnets = ["subnet-abcdefgh", "subnet-12345678", "subnet-ab12cd34"]
+  }
+}
+
+dependency "istio" {
+  config_path = "../eks-istio"
+  mock_outputs = {
+    istio_ingress_lb = {
+      dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
+      zone_id  = "ZABC123456DEF"
+    }
   }
 }
 
 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
+  cluster_name      = dependency.eks.inputs.cluster_name
+  istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
+  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_name          = dependency.eks.inputs.vpc_name
+  route53_endpoints = include.root.inputs.route53_endpoints
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-grafana/terragrunt.hcl
index c2172e8..65ab33f 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-grafana/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-grafana/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -17,22 +18,23 @@ dependency "eks" {
     cluster_name = "a-cluster-name"
   }
 }
+
 dependency "eks-loki" {
   config_path = "../eks-loki"
   mock_outputs = {
     rwo_storage_class = "gp3-encrypted"
   }
 }
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
 
 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
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+  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               = include.root.inputs.grafana_hostname
+  rwo_storage_class             = dependency.eks-loki.outputs.rwo_storage_class
+  grafana_chart_version         = include.root.inputs.grafana_chart_version
+  grafana_tag                   = include.root.inputs.grafana_tag
+  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
+  init_chown_data_image_tag     = include.root.inputs.init_chown_data_image_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-istio/terragrunt.hcl
index 5a30c0e..c7c22c8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-istio/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-istio/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -26,6 +27,6 @@ inputs = {
   profile             = include.root.inputs.aws_profile
   region              = include.root.inputs.aws_region
   cluster_name        = dependency.eks.outputs.cluster_name
-  istio_chart_version = "1.22.1"
-  istio_version       = "1.22.1"
+  istio_chart_version = include.root.inputs.istio_version
+  istio_version       = include.root.inputs.istio_version
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-k8s-dashboard/terragrunt.hcl
new file mode 100644
index 0000000..cd1961b
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-k8s-dashboard/terragrunt.hcl
@@ -0,0 +1,36 @@
+include "root" {
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
+}
+
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git?ref=${include.root.inputs.release_version}"
+  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"
+    vpc_domain_name = "example.com"
+  }
+}
+
+dependency "eks-loki" {
+  config_path  = "../eks-loki"
+  skip_outputs = true
+}
+
+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       = include.root.inputs.dashboard_hostname
+  k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
+  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
+}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-karpenter/terragrunt.hcl
index 982e1d7..6b1a862 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-karpenter/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-karpenter/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -35,4 +36,8 @@ inputs = {
   karpenter_node_group_name = dependency.eks.outputs.node_group_name
   oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
   vpc_id                    = dependency.eks.outputs.vpc_id
+  karpenter_helm_chart      = include.root.inputs.karpenter_helm_chart
+  karpenter_tag             = include.root.inputs.karpenter_tag
+  kubectl_tag               = include.root.inputs.kubectl_image_tag
+
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali.disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali.disable/terragrunt.hcl.disable
deleted file mode 100644
index 63e88a4..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali.disable/terragrunt.hcl.disable
+++ /dev/null
@@ -1,76 +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     = 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-eng-eks-test/eks-kiali.disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali/terragrunt.hcl.disable
similarity index 84%
rename from lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-kiali.disable/terragrunt.hcl.disable
rename to lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali/terragrunt.hcl.disable
index c395110..1e04fe0 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-test/eks-kiali.disable/terragrunt.hcl.disable
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-kiali/terragrunt.hcl.disable
@@ -1,11 +1,12 @@
 include "root" {
-  path = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
-  source = "../../../../../../../tfmod-kiali"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
+  # source = "../../../../../../../tfmod-kiali"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -53,9 +54,12 @@ dependency "eks-grafana" {
 }
 
 inputs = {
+  kiali_operator_version = include.root.inputs.kiali_operator_version
+  kiali_application_version = include.root.inputs.kiali_application_version
+
   profile                 = include.root.inputs.aws_profile
   cluster_domain          = dependency.eks.inputs.vpc_domain_name
-  operators_namespace     = dependency.eks.inputs.operators_ns
+  operators_namespace     = "operators"
   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
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-loki/terragrunt.hcl
index cc94f7f..2c6b6be 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-loki/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-loki/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -22,10 +23,22 @@ dependency "eks-istio" {
   config_path  = "../eks-istio"
   skip_outputs = true
 }
+dependency "eks-prometheus" {
+  config_path  = "../eks-prometheus"
+  skip_outputs = true
+}
 
 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
+  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
+  loki_chart_version              = include.root.inputs.loki_chart_version
+  loki_tag                        = include.root.inputs.loki_tag
+  canary_tag                      = include.root.inputs.canary_tag
+  enterprise_logs_provisioner_tag = include.root.inputs.enterprise_logs_provisioner_tag
+  gateway_tag                     = include.root.inputs.gateway_tag
+  memcached_tag                   = include.root.inputs.memcached_tag
+  exporter_tag                    = include.root.inputs.exporter_tag
+  sidecar_tag                     = include.root.inputs.sidecar_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-metrics-server/terragrunt.hcl
index 5414a72..387653b 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-metrics-server/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-metrics-server/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,8 +19,15 @@ 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
-  region       = include.root.inputs.aws_region
+  profile                   = include.root.inputs.aws_profile
+  cluster_name              = dependency.eks.outputs.cluster_name
+  region                    = include.root.inputs.aws_region
+  metrics_server_helm_chart = include.root.inputs.metrics_server_helm_chart
+  metrics_server_tag        = include.root.inputs.metrics_server_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-prometheus/terragrunt.hcl
index 62611b1..e6c54b1 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-prometheus/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-prometheus/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -18,13 +19,20 @@ dependency "eks" {
   }
 }
 
-dependency "eks-istio" {
-  config_path  = "../eks-istio"
+dependency "eks-dns" {
+  config_path  = "../eks-dns"
   skip_outputs = true
 }
 
 inputs = {
-  profile      = include.root.inputs.aws_profile
-  region       = include.root.inputs.aws_region
-  cluster_name = dependency.eks.outputs.cluster_name
+  profile                        = include.root.inputs.aws_profile
+  region                         = include.root.inputs.aws_region
+  cluster_name                   = dependency.eks.outputs.cluster_name
+  prometheus_chart_version       = include.root.inputs.prometheus_chart_version
+  prometheus_server_tag          = include.root.inputs.prometheus_server_tag
+  prometheus_config_reloader_tag = include.root.inputs.prometheus_config_reloader_tag
+  alertmanager_tag               = include.root.inputs.alertmanager_tag
+  kube_state_metrics_tag         = include.root.inputs.kube_state_metrics_tag
+  node_exporter_tag              = include.root.inputs.node_exporter_tag
+  pushgateway_tag                = include.root.inputs.pushgateway_tag
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-tempo/terragrunt.hcl
index 7f3d706..e9ebd48 100644
--- a/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-test-cicd/eks-tempo/terragrunt.hcl
@@ -1,10 +1,11 @@
 include "root" {
-  path   = find_in_parent_folders()
-  expose = true
+  path           = find_in_parent_folders("root.hcl")
+  merge_strategy = "deep"
+  expose         = true
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-tempo.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -32,10 +33,14 @@ dependency "eks-prometheus" {
 }
 
 inputs = {
-  profile              = include.root.inputs.aws_profile
-  region               = include.root.inputs.aws_region
+  account_id           = include.root.locals.account_id
+  profile              = include.root.locals.aws_profile
+  region               = include.root.locals.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
+  tempo_chart_version  = include.root.inputs.tempo_chart_version
+  tempo_tag            = include.root.inputs.tempo_tag
+
 }
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 f180390..cc7c893 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
@@ -1,39 +1,37 @@
 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
-  vpc_name                                 = include.root.inputs.vpc_name
-  cluster_name                             = "platform-test-cicd"
-  cluster_version                          = "1.30"
-  vpc_domain_name                          = include.root.inputs.vpc_domain_name
-  eks_instance_disk_size                   = 100
+  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
-  eks_ng_desired_size                      = 2
-  eks_ng_max_size                          = 10
-  eks_ng_min_size                          = 2
-  operators_ns                             = "operators"
-  enable_cluster_creator_admin_permissions = true
-  cluster_endpoint_public_access           = 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
+  project_name                             = include.root.inputs.project_name
+  project_number                           = include.root.inputs.project_number
+  project_role                             = include.root.inputs.project_role
   region                                   = include.root.inputs.aws_region
-  cluster_mailing_list                     = "ahmed.m.youssef@census.gov"
-  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}"
-  }
-
+  tags                                     = include.root.inputs.tags
+  terraform                                = include.root.inputs.terraform
+  terragrunt                               = include.root.inputs.terragrunt
+  vpc_domain_name                          = include.root.inputs.vpc_domain_name
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=main"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -42,22 +40,17 @@ terraform {
 
 inputs = {
   aws_account_id                           = local.account_id
-  profile                                  = local.profile
-  vpc_name                                 = local.eks_vpc_name
+  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
   cluster_name                             = local.cluster_name
   cluster_version                          = local.cluster_version
+  creator                                  = local.creator
   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
-  operators_ns                             = local.operators_ns
+  eks_vpc_name                             = local.eks_vpc_name
   enable_cluster_creator_admin_permissions = local.enable_cluster_creator_admin_permissions
-  cluster_endpoint_public_access           = local.cluster_endpoint_public_access
-  tags                                     = local.tags
-  vcp_domain_name                          = local.vpc_domain_name
-  region                                   = local.region
-  creator                                  = local.cluster_mailing_list
-  os_username                              = local.cluster_mailing_list
+  os_username                              = local.creator
   shared_vpc_label                         = local.environment_abbr
+  tags                                     = local.tags
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/cluster.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/cluster.hcl
new file mode 100644
index 0000000..8d2831c
--- /dev/null
+++ b/lab/development/us-gov-east-1/vpc/platform-test-x/cluster.hcl
@@ -0,0 +1,20 @@
+# lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/cluster.hcl
+
+# 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"
+  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
+  terraform                                = true
+  terragrunt                               = true
+  tags = {
+    "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-test-x/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl
deleted file mode 100644
index f72b39f..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-cert-manager/terragrunt.hcl
+++ /dev/null
@@ -1,34 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
-  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"
-  }
-}
-
-inputs = {
-  cluster_name                     = dependency.eks.outputs.cluster_name
-  cluster_mailing_list             = dependency.eks.inputs.creator
-  oidc_provider_arn                = dependency.eks.outputs.oidc_provider_arn
-  profile                          = include.root.inputs.aws_profile
-  region                           = include.root.inputs.aws_region
-  cert_manager_helm_chart          = "1.15.1"
-  cert_manager_cainjector_tag      = "v1.15.1"
-  cert_manager_controller_tag      = "v1.15.1"
-  cert_manager_startupapicheck_tag = "v1.15.1"
-  cert_manager_webhook_tag         = "v1.15.1"
-  cluster_issuer_name              = "cert-manager"
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl
deleted file mode 100644
index 7c6a172..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-config/terragrunt.hcl
+++ /dev/null
@@ -1,42 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-# locals {
-#   tag_costallocation = "census:csvd:platformbaseline"
-# }
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-dependency "eks" {
-  config_path = "../eks"
-  mock_outputs = {
-    vpc_id                                          = "a-vpc-id"
-    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"
-  }
-}
-
-inputs = {
-  profile                                         = include.root.inputs.aws_profile
-  region                                          = include.root.inputs.aws_region
-  vpc_id                                          = dependency.eks.outputs.vpc_id
-  cluster_name                                    = dependency.eks.outputs.cluster_name
-  subnets                                         = dependency.eks.outputs.subnets
-  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-test-x/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl
deleted file mode 100644
index 46d26d8..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-dns/terragrunt.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-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-x/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl
deleted file mode 100644
index c2172e8..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl
+++ /dev/null
@@ -1,38 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
-  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-loki" {
-  config_path = "../eks-loki"
-  mock_outputs = {
-    rwo_storage_class = "gp3-encrypted"
-  }
-}
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
-
-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
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable
deleted file mode 100644
index c2172e8..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-grafana/terragrunt.hcl,disable
+++ /dev/null
@@ -1,38 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git"
-  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-loki" {
-  config_path = "../eks-loki"
-  mock_outputs = {
-    rwo_storage_class = "gp3-encrypted"
-  }
-}
-# dependency "eks-tempo" {
-#   config_path  = "../eks-tempo"
-#   skip_outputs = true
-# }
-
-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
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl
deleted file mode 100644
index c1190ab..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-istio/terragrunt.hcl
+++ /dev/null
@@ -1,33 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git"
-  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-karpenter" {
-  config_path  = "../eks-karpenter"
-  skip_outputs = true
-}
-
-inputs = {
-  profile             = include.root.inputs.aws_profile
-  region              = include.root.inputs.aws_region
-  cluster_name        = dependency.eks.outputs.cluster_name
-  istio_chart_version = "1.22.1"
-  istio_version       = "1.22.1"
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable
deleted file mode 100644
index 7004f22..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-k8s-dashboard/terragrunt.hcl.disable
+++ /dev/null
@@ -1,31 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-k8s-dashboard.git"
-  # source = "../../../../../../../tfmod-k8s-dashboard"
-  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-karpenter" {
-  config_path  = "../eks-karpenter"
-  skip_outputs = true
-}
-
-inputs = {
-  profile               = include.root.inputs.aws_profile
-  region                = include.root.inputs.aws_region
-  cluster_name          = dependency.eks.outputs.cluster_name
-  # 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-test-x/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl
deleted file mode 100644
index a6e5264..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-karpenter/terragrunt.hcl
+++ /dev/null
@@ -1,38 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-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"
-  mock_outputs = {
-    cluster_endpoint  = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com"
-    cluster_name      = "a-cluster-name"
-    node_group_name   = "node_group_a-cluster-name"
-    oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA"
-    vpc_id            = "a-vpc-name"
-  }
-}
-
-dependency "eks-config" {
-  config_path  = "../eks-config"
-  skip_outputs = true
-}
-
-inputs = {
-  profile                   = include.root.inputs.aws_profile
-  region                    = include.root.inputs.aws_region
-  cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
-  cluster_name              = dependency.eks.outputs.cluster_name
-  karpenter_node_group_name = dependency.eks.outputs.node_group_name
-  oidc_provider_arn         = dependency.eks.outputs.oidc_provider_arn
-  vpc_id                    = dependency.eks.outputs.vpc_id
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable
deleted file mode 100644
index 3dabd56..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-kiali.disable/terragrunt.hcl.disable
+++ /dev/null
@@ -1,76 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-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"
-  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-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl
deleted file mode 100644
index 069f967..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl
+++ /dev/null
@@ -1,31 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  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"]
-  }
-}
-
-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-istio" {
-  config_path  = "../eks-istio"
-  skip_outputs = true
-}
-
-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
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable
deleted file mode 100644
index 069f967..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-loki/terragrunt.hcl.disable
+++ /dev/null
@@ -1,31 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  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"]
-  }
-}
-
-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-istio" {
-  config_path  = "../eks-istio"
-  skip_outputs = true
-}
-
-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
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl
deleted file mode 100644
index 010e61a..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-metrics-server/terragrunt.hcl
+++ /dev/null
@@ -1,25 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-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"
-  mock_outputs = {
-    cluster_name = "a-cluster-name"
-  }
-}
-
-inputs = {
-  profile      = include.root.inputs.aws_profile
-  cluster_name = dependency.eks.outputs.cluster_name
-  region       = include.root.inputs.aws_region
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/README.md b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/README.md
deleted file mode 100644
index bbbffb2..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/README.md
+++ /dev/null
@@ -1,198 +0,0 @@
-## eks-prometheus
-This module deploys EKS kubeenetes prometheus inside existing EKS cluster. Prometheus is an open-source systems monitoring and alerting tool.
-This module consisits of 4 components. It creates prometheus namespace and  copies image repositories for the following components from quay.io into local account ECR repository. It deploys these components using helm charts using the configured ECR repositories.
-    1. prometheus-alert-manager
-    2. prometheus-node-exporter
-    3. prometheus-pushgateway
-    4. prometheus-server
-
-### Dependencies
-This module is dependent on EKS module (eks). The cluster should exist already for this module to work.
-
-### Inputs
-    cluster_name
-    profile
-    prometheus_chart_version
-    prometheus_server_tag
-    prometheus_config_reloader_tag
-    alertmanager_tag
-    kube_state_metrics_tag
-    node_exporter_tag
-    pushgateway_tag
-    rwo_storage_class
-
-### Outputs
-    alertmanager_internal_endpoint
-    alertmanager_headless_internal_endpoint
-    pushgateway_internal_endpoint
-    prometheus_server_internal_endpoint
-
-### Issues observed/fixed
-1. The rwo_storage_class value had to be updated from "gp3" to "gp3-encrypted"
-2. The node_exporter_tag value had to be updated from "1.6.1" to "v1.8.1"
-3. The kube_state_metrics_tag value had to be updated from "2.10.0" to "v2.6.0"
-4. The alertmanager_tag value had to be updated from
-5. The helm chart set config for the ecr image had to be split into 2 components, one for registry and other for repository as an example mentioned below:
-
-    ```
-    set {
-    name = "kube-state-metrics.image.registry"
-    value = module.images.images[local.ksm_key].dest_registry
-  }
-  set {
-    name = "kube-state-metrics.image.repository"
-    value = module.images.images[local.ksm_key].dest_repository
-      }
-    ```
-
-6. In some other cases the image ecr repository had to be split by the colon separatory (:)
-
-    ```
-    set {
-    name = "alertmanager.configmapReload.image.repository"
-    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
-        }
-    ```
-
-### Chart Notes
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus-pushgateway,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl port-forward $POD_NAME 9091
-        echo "Visit http://127.0.0.1:9091 to use your application"
-    ```
-
-    The Prometheus server can be accessed via port 80 on the following DNS name from within your cluster:
-    prometheus-server.prometheus.svc.cluster.local
-
-
-    Get the Prometheus server URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9090
-    ```
-
-    The Prometheus alertmanager can be accessed via port 9093 on the following DNS name from within your cluster:
-    `prometheus-alertmanager.prometheus.svc.cluster.local`
-
-
-    Get the Alertmanager URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=alertmanager,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9093
-    ```
-
-    #################################################################################
-    ######   WARNING: Pod Security Policy has been disabled by default since    #####
-    ######            it deprecated after k8s 1.25+. use                        #####
-    ######            (index .Values "prometheus-node-exporter" "rbac"          #####
-    ######            "pspEnabled") with (index .Values                         #####
-    ######            "prometheus-node-exporter" "rbac" "pspAnnotations")       #####
-    ######            in case you still need it.                                #####
-    #################################################################################
-
-
-    The Prometheus PushGateway can be accessed via port 9091 on the following DNS name from within your cluster:
-    `prometheus-prometheus-pushgateway.prometheus.svc.cluster.local`
-
-
-    Get the PushGateway URL by running these commands in the same shell:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app=prometheus-pushgateway,component=pushgateway" -o jsonpath="{.items[0].metadata.name}")
-        kubectl --namespace prometheus port-forward $POD_NAME 9091
-    ```
-
-    For more information on running Prometheus, visit:
-    https://prometheus.io/
-
-    kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
-    The exposed metrics can be found here:
-    https://github.com/kubernetes/kube-state-metrics/blob/master/docs/README.md#exposed-metrics
-
-    The metrics are exported on the HTTP endpoint /metrics on the listening port.
-    In your case, `prometheus-kube-state-metrics.prometheus.svc.cluster.local:8080/metrics`
-
-    They are served either as plaintext or protobuf depending on the Accept header.
-    They are designed to be consumed either by Prometheus itself or by a scraper that is compatible with scraping a Prometheus client endpoint.
-
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=alertmanager,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        echo "Visit http://127.0.0.1:9093 to use your application"
-        kubectl --namespace prometheus port-forward $POD_NAME 9093:80
-    ```
-
-    1. Get the application URL by running these commands:
-
-    ```bash
-        export POD_NAME=$(kubectl get pods --namespace prometheus -l "app.kubernetes.io/name=prometheus-node-exporter,app.kubernetes.io/instance=prometheus" -o jsonpath="{.items[0].metadata.name}")
-        echo "Visit http://127.0.0.1:9100 to use your application"
-        kubectl port-forward --namespace prometheus $POD_NAME 9100
-    ```
-
-<!--BEGIN-TF-DOCS-->
-## Requirements
-
-| Name | Version |
-|------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.14.0 |
-| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.11.0 |
-| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.23.0 |
-| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
-
-## Providers
-
-| Name | Version |
-|------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.11.0 |
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.23.0 |
-
-## Modules
-
-| Name | Source | Version |
-|------|--------|---------|
-| <a name="module_images"></a> [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade |
-
-## Resources
-
-| Name | Type |
-|------|------|
-| [helm_release.prometheus](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
-| [kubernetes_namespace.ns](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
-| [kubernetes_namespace.existing-ns](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/namespace) | data source |
-
-## Inputs
-
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| <a name="input_alertmanager_tag"></a> [alertmanager\_tag](#input\_alertmanager\_tag) | The image tag of the alertmanager image. | `string` | `"v0.27.0"` | no |
-| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the cluster into which prometheus will be installed. | `string` | n/a | yes |
-| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Indicates whether the `namespace` needs to be created ('true') or already exists (not `true`) | `bool` | `true` | no |
-| <a name="input_kube_state_metrics_tag"></a> [kube\_state\_metrics\_tag](#input\_kube\_state\_metrics\_tag) | The image tag of the kube-state-metrics image. | `string` | `"v2.13.0"` | no |
-| <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace to install the prometheus components. Defaults to 'prometheus' | `string` | `"prometheus"` | no |
-| <a name="input_node_exporter_tag"></a> [node\_exporter\_tag](#input\_node\_exporter\_tag) | The image tag of the node-exporter image. | `string` | `"v1.8.2"` | no |
-| <a name="input_profile"></a> [profile](#input\_profile) | AWS\_PROFILE to use to apply the terraform script. | `string` | `""` | no |
-| <a name="input_prometheus_chart_version"></a> [prometheus\_chart\_version](#input\_prometheus\_chart\_version) | The version of prometheus to install into the cluster. | `string` | `"25.24.1"` | no |
-| <a name="input_prometheus_config_reloader_tag"></a> [prometheus\_config\_reloader\_tag](#input\_prometheus\_config\_reloader\_tag) | The image tag of the prometheus-config-reloader image. | `string` | `"v0.75.1"` | no |
-| <a name="input_prometheus_server_tag"></a> [prometheus\_server\_tag](#input\_prometheus\_server\_tag) | The image tag of prometheus server to install into the cluster. | `string` | `"v2.53.1"` | no |
-| <a name="input_pushgateway_tag"></a> [pushgateway\_tag](#input\_pushgateway\_tag) | The image tag of the pushgateway image. | `string` | `"v1.9.0"` | no |
-| <a name="input_rwo_storage_class"></a> [rwo\_storage\_class](#input\_rwo\_storage\_class) | Specify the storage class for read/write/once persistent volumes. | `string` | `"gp3-encrypted"` | no |
-
-## Outputs
-
-| Name | Description |
-|------|-------------|
-| <a name="output_alertmanager_headless_internal_endpoint"></a> [alertmanager\_headless\_internal\_endpoint](#output\_alertmanager\_headless\_internal\_endpoint) | n/a |
-| <a name="output_alertmanager_internal_endpoint"></a> [alertmanager\_internal\_endpoint](#output\_alertmanager\_internal\_endpoint) | n/a |
-| <a name="output_module_name"></a> [module\_name](#output\_module\_name) | The name of this module. |
-| <a name="output_module_version"></a> [module\_version](#output\_module\_version) | The version of this module. |
-| <a name="output_prometheus_namespace"></a> [prometheus\_namespace](#output\_prometheus\_namespace) | n/a |
-| <a name="output_prometheus_server_internal_endpoint"></a> [prometheus\_server\_internal\_endpoint](#output\_prometheus\_server\_internal\_endpoint) | n/a |
-| <a name="output_pushgateway_internal_endpoint"></a> [pushgateway\_internal\_endpoint](#output\_pushgateway\_internal\_endpoint) | n/a |
-<!--END-TF-DOCS-->
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl
deleted file mode 100644
index 308ade0..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl
+++ /dev/null
@@ -1,30 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
-  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-istio" {
-  config_path  = "../eks-istio"
-  skip_outputs = true
-}
-
-inputs = {
-  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-prometheus/terragrunt.hcl.disable b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable
deleted file mode 100644
index 308ade0..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-prometheus/terragrunt.hcl.disable
+++ /dev/null
@@ -1,30 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git"
-  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-istio" {
-  config_path  = "../eks-istio"
-  skip_outputs = true
-}
-
-inputs = {
-  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 b/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
deleted file mode 100644
index c52ffc3..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks-tempo/terragrunt.hcl
+++ /dev/null
@@ -1,42 +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 = {
-  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
-  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
-}
diff --git a/lab/development/us-gov-east-1/vpc/platform-test-x/eks/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-test-x/eks/terragrunt.hcl
deleted file mode 100644
index 76397c6..0000000
--- a/lab/development/us-gov-east-1/vpc/platform-test-x/eks/terragrunt.hcl
+++ /dev/null
@@ -1,64 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-locals {
-  # Set cluster/platform specific variables, or extract from the hierarchy. 
-  account_id                               = include.root.inputs.aws_account_id
-  vpc_name                                 = include.root.inputs.vpc_name
-  cluster_name                             = "platform-test-x"
-  cluster_version                          = "1.30"
-  vpc_domain_name                          = include.root.inputs.vpc_domain_name
-  eks_instance_disk_size                   = 100
-  eks_vpc_name                             = include.root.inputs.vpc_name
-  eks_ng_desired_size                      = 2
-  eks_ng_max_size                          = 10
-  eks_ng_min_size                          = 2
-  operators_ns                             = "operators"
-  enable_cluster_creator_admin_permissions = true
-  cluster_endpoint_public_access           = true
-  profile                                  = include.root.inputs.aws_profile
-  region                                   = include.root.inputs.aws_region
-  cluster_mailing_list                     = "luther.coleman.mcginty@census.gov"
-  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}"
-  }
-
-}
-
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=main"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
-  }
-}
-
-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
-  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
-  vcp_domain_name                          = local.vpc_domain_name
-  region                                   = local.region
-  creator                                  = local.cluster_mailing_list
-  os_username                              = local.cluster_mailing_list
-  shared_vpc_label                         = local.environment_abbr
-}
diff --git a/lab/development/us-gov-east-1/vpc/vpc.hcl b/lab/development/us-gov-east-1/vpc/vpc.hcl
index 907ce6d..8da18d0 100644
--- a/lab/development/us-gov-east-1/vpc/vpc.hcl
+++ b/lab/development/us-gov-east-1/vpc/vpc.hcl
@@ -1,6 +1,8 @@
+# lab/development/us-gov-east-1/vpc/vpc.hcl
+
 # Set VPC specific variables. These are automatically pulled in to configure the remote state bucket in the root
 # terragrunt.hcl configuration.
 locals {
   vpc_name        = "vpc3-lab-dev"
   vpc_domain_name = "dev.lab.csp2.census.gov"
-}
\ No newline at end of file
+}
diff --git a/lab/terragrunt.hcl b/lab/root.hcl
similarity index 83%
rename from lab/terragrunt.hcl
rename to lab/root.hcl
index cc780ba..87fe323 100644
--- a/lab/terragrunt.hcl
+++ b/lab/root.hcl
@@ -1,35 +1,35 @@
+# lab/root.hcl
+
 # ---------------------------------------------------------------------------------------------------------------------
 # TERRAGRUNT CONFIGURATION
 # 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 versions
+  versions = read_terragrunt_config(find_in_parent_folders("./_envcommon/default-versions.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"))
 
   # 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
-  organization        = local.common_vars.locals.organization
-  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 +64,10 @@ 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.versions.locals,
+  local.vpc_vars.locals
 )