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 11dfb9a..e25b072 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
@@ -4,6 +4,15 @@ include "root" {
   expose         = true
 }
 
+terraform {
+  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"]
+  }
+}
+
 dependencies {
   paths = [
     "../eks",
@@ -17,33 +26,28 @@ dependency "eks" {
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
 
   mock_outputs = {
-    cluster_name      = "mock-cluster"
+    cluster_name      = include.root.inputs.cluster_name
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
     cluster_endpoint  = "https://mock-endpoint.eks.amazonaws.com"
-    cluster_version   = "1.27"
-  }
-}
-
-terraform {
-  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"]
+    cluster_version   = include.root.inputs.cluster_version
   }
 }
 
 inputs = {
-  # Core configuration
+  # AWS Configuration
+  profile = include.root.inputs.aws_profile
+  region  = include.root.inputs.aws_region
+
+  # Cluster Configuration
   cluster_name         = dependency.eks.outputs.cluster_name
-  oidc_provider_arn    = dependency.eks.outputs.oidc_provider_arn
   cluster_mailing_list = include.root.inputs.cluster_mailing_list
+  oidc_provider_arn    = dependency.eks.outputs.oidc_provider_arn
 
-  # Cert-manager configuration
+  # Cert Manager Configuration
   cert_manager_helm_chart = include.root.inputs.cert_manager_helm_chart
   cluster_issuer_name     = include.root.inputs.cluster_issuer_name
 
-  # Version tags
+  # Version Configuration
   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
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 5d935d7..2bbcc9d 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
@@ -37,18 +37,18 @@ dependency "eks" {
 }
 
 inputs = {
-  # Core cluster configuration
-  cluster_name                                    = dependency.eks.outputs.cluster_name
-  vpc_id                                          = dependency.eks.outputs.vpc_id
-  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
-
-  # AWS configuration
+  # AWS Configuration
   profile = include.root.inputs.aws_profile
   region  = include.root.inputs.aws_region
 
-  # Additional configurations
-  oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
+  # Core Cluster Configuration
+  cluster_name                                    = dependency.eks.outputs.cluster_name
+  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
+  security_group_all_worker_mgmt_id               = dependency.eks.outputs.security_group_all_worker_mgmt_id
+  subnets                                         = dependency.eks.outputs.subnets
+  vpc_id                                          = dependency.eks.outputs.vpc_id
+
+  # Additional Configuration
   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 1caebed..c302416 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
@@ -16,7 +16,8 @@ dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
+    cluster_name = include.root.inputs.cluster_name
+    subnets      = ["subnet-mock1", "subnet-mock2", "subnet-mock3"]
   }
 }
 
@@ -25,23 +26,35 @@ dependency "istio" {
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
     istio_ingress_lb = {
-      dns_name = "a1111111111111111111111111111111-2bbbbbbbbbbbbbbb.elb.us-gov-east-1.amazonaws.com"
-      zone_id  = "ZABC123456DEF"
+      dns_name = "mock-${include.root.inputs.cluster_name}.elb.amazonaws.com"
+      zone_id  = "MOCKZONEID"
     }
   }
 }
 
 dependencies {
-  paths = ["../eks-karpenter", "../eks-config"]
+  paths = [
+    "../eks-config",
+    "../eks-karpenter"
+  ]
 }
+
 inputs = {
-  cluster_name      = dependency.eks.inputs.cluster_name
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name = include.root.inputs.cluster_name
+
+  # Network Configuration
   istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
-  profile           = dependency.eks.inputs.aws_profile
-  region            = dependency.eks.inputs.aws_region
-  route53_endpoints = dependency.eks.inputs.route53_endpoints
-  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
+  subnets          = dependency.eks.outputs.subnets
+  vpc_domain_name  = include.root.inputs.vpc_domain_name
+  vpc_name         = include.root.inputs.vpc_name
+
+  # Additional Configuration
+  tags = include.root.inputs.tags
 }
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 aa08067..a5ef996 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
@@ -18,7 +18,7 @@ dependency "eks" {
   mock_outputs = {
     cluster_name      = "mock-cluster"
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
-    cluster_version   = "1.27"
+    cluster_version   = include.root.inputs.cluster_version
   }
 }
 
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 06517aa..7c89235 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
@@ -4,30 +4,41 @@ include "root" {
   expose         = true
 }
 
+terraform {
+  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"]
+  }
+}
+
 dependencies {
-  paths = ["../eks", "../eks-config"]
+  paths = [
+    "../eks",
+    "../eks-config"
+  ]
 }
 
 dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_name      = "mock-cluster"
+    cluster_name      = include.root.inputs.cluster_name
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
 
-terraform {
-  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"]
-  }
-}
-
 inputs = {
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
-  istio_version     = include.root.inputs.istio_version
-  istio_namespace   = include.root.inputs.istio_namespace
+
+  # Istio Configuration
+  istio_namespace = include.root.inputs.istio_namespace
+  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 66743c4..4d8801f 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
@@ -5,7 +5,10 @@ include "root" {
 }
 
 dependencies {
-  paths = ["../eks", "../eks-config"]
+  paths = [
+    "../eks",
+    "../eks-config"
+  ]
 }
 
 dependency "eks" {
@@ -26,6 +29,9 @@ terraform {
 }
 
 inputs = {
-  cluster_name          = dependency.eks.outputs.cluster_name
+  # Cluster Configuration
+  cluster_name = dependency.eks.outputs.cluster_name
+
+  # Dashboard Configuration
   k8s_dashboard_version = include.root.inputs.k8s_dashboard_version
 }
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
index 37e0d71..1bc9afb 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
@@ -5,7 +5,11 @@ include "root" {
 }
 
 dependencies {
-  paths = ["../eks", "../eks-config", "../eks-istio"]
+  paths = [
+    "../eks",
+    "../eks-config",
+    "../eks-istio"
+  ]
 }
 
 dependency "eks" {
@@ -26,7 +30,15 @@ terraform {
 }
 
 inputs = {
-  cluster_name    = dependency.eks.outputs.cluster_name
-  kiali_version   = include.root.inputs.kiali_version
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name = dependency.eks.outputs.cluster_name
+
+  # Kiali Configuration
   istio_namespace = include.root.inputs.istio_namespace
+  kiali_version   = include.root.inputs.kiali_version
 }
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 b8d2e5d..8ec45cd 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
@@ -5,14 +5,17 @@ include "root" {
 }
 
 dependencies {
-  paths = ["../eks", "../eks-config"]
+  paths = [
+    "../eks",
+    "../eks-config"
+  ]
 }
 
 dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_name      = "mock-cluster"
+    cluster_name      = include.root.inputs.cluster_name
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
@@ -26,8 +29,16 @@ terraform {
 }
 
 inputs = {
-  cluster_name   = dependency.eks.outputs.cluster_name
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name = dependency.eks.outputs.cluster_name
+
+  # Loki Configuration
   loki_version   = include.root.inputs.loki_version
-  storage_class  = include.root.inputs.storage_class
   retention_days = include.root.inputs.loki_retention_days
+  storage_class  = include.root.inputs.storage_class
 }
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 25a0301..1657912 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
@@ -5,7 +5,10 @@ include "root" {
 }
 
 dependencies {
-  paths = ["../eks", "../eks-config"]
+  paths = [
+    "../eks",
+    "../eks-config"
+  ]
 }
 
 dependency "eks" {
@@ -25,6 +28,14 @@ terraform {
 }
 
 inputs = {
-  cluster_name           = dependency.eks.outputs.cluster_name
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name = dependency.eks.outputs.cluster_name
+
+  # Metrics Server Configuration
   metrics_server_version = include.root.inputs.metrics_server_version
 }
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 de3cefa..a51af22 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
@@ -4,31 +4,42 @@ include "root" {
   expose         = true
 }
 
+terraform {
+  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"]
+  }
+}
+
 dependencies {
-  paths = ["../eks", "../eks-config"]
+  paths = [
+    "../eks",
+    "../eks-config"
+  ]
 }
 
 dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_name      = "mock-cluster"
+    cluster_name      = include.root.inputs.cluster_name
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
 
-terraform {
-  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"]
-  }
-}
-
 inputs = {
-  cluster_name       = dependency.eks.outputs.cluster_name
-  oidc_provider_arn  = dependency.eks.outputs.oidc_provider_arn
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name      = dependency.eks.outputs.cluster_name
+  oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
+
+  # Prometheus Configuration
   prometheus_version = include.root.inputs.prometheus_version
-  storage_class      = include.root.inputs.storage_class
-  retention_days     = include.root.inputs.prometheus_retention_days
+  retention_days    = include.root.inputs.prometheus_retention_days
+  storage_class     = include.root.inputs.storage_class
 }
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 e52d57b..e47f0d3 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
@@ -16,8 +16,8 @@ dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   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"
+    cluster_name      = include.root.inputs.cluster_name
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
 
@@ -35,17 +35,30 @@ dependency "eks-prometheus" {
 }
 
 dependencies {
-  paths = ["../eks-config", "../eks-karpenter", "../eks-dns"]
+  paths = [
+    "../eks",
+    "../eks-config",
+    "../eks-dns",
+    "../eks-karpenter",
+    "../eks-prometheus"
+  ]
 }
 
 inputs = {
-  account_id           = dependency.eks.inputs.aws_account_id
-  cluster_name         = dependency.eks.outputs.cluster_name
-  oidc_provider_arn    = dependency.eks.outputs.oidc_provider_arn
-  profile              = dependency.eks.inputs.aws_profile
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
+  cluster_name      = dependency.eks.outputs.cluster_name
+  oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
+
+  # Prometheus Configuration
   prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace
-  prometheus_port      = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number
-  region               = dependency.eks.inputs.aws_region
-  tempo_chart_version  = dependency.eks.inputs.tempo_chart_version
-  tempo_tag            = dependency.eks.inputs.tempo_tag
+  prometheus_port     = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number
+
+  # Tempo Configuration
+  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 e941d00..1ea01e3 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
@@ -14,19 +14,19 @@ terraform {
 }
 
 inputs = {
-  # Core cluster configuration
+  # AWS Configuration
+  profile = include.root.inputs.aws_profile
+  region  = include.root.inputs.aws_region
+
+  # Core Cluster Configuration
   cluster_name    = include.root.inputs.cluster_name
   cluster_version = include.root.inputs.cluster_version
-  vpc_id          = include.root.inputs.vpc_id
   subnets         = include.root.inputs.subnet_ids
+  vpc_id          = include.root.inputs.vpc_id
 
-  # AWS configuration
-  profile = include.root.inputs.aws_profile
-  region  = include.root.inputs.aws_region
-
-  # Node group configuration
+  # Node Group Configuration
   eks_managed_node_groups = include.root.inputs.eks_managed_node_groups
 
-  # Tags
+  # Additional Configuration
   tags = include.root.inputs.tags
 }