diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 237054a..34ab8bd 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -56,6 +56,7 @@ locals {
   download_dashboards_image_tag = "7.85.0"
   grafana_chart_version         = "8.8.5"
   grafana_hostname              = "grafana"
+  grafana_namespace             = "grafana"
   grafana_tag                   = "11.4.0"
   init_chown_data_image_tag     = "1.31.1"
 
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 86fdfbd..b485d01 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
@@ -21,7 +21,7 @@ dependency "eks" {
   }
 }
 
-dependency "istio" {
+dependency "eks-istio" {
   config_path                             = "../eks-istio"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
@@ -35,6 +35,7 @@ dependency "istio" {
 dependencies {
   paths = [
     "../eks-config",
+    "../eks-istio",
     "../eks-karpenter"
   ]
 }
@@ -49,9 +50,8 @@ inputs = {
   cluster_name = include.root.inputs.cluster_name
 
   # Network Configuration
-  istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
+  istio_ingress_lb  = dependency.eks-istio.outputs.istio_ingress_lb
   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
 
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 a5ef996..67e5e32 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,6 @@ dependency "eks" {
   mock_outputs = {
     cluster_name      = "mock-cluster"
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
-    cluster_version   = include.root.inputs.cluster_version
   }
 }
 
@@ -57,7 +56,6 @@ inputs = {
   # Grafana Configuration
   grafana_chart_version         = include.root.inputs.grafana_chart_version
   grafana_tag                   = include.root.inputs.grafana_tag
-  grafana_version               = include.root.inputs.grafana_version
   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 82de792..b9712be 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
@@ -5,7 +5,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio.git?ref=outputs"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
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 1bc9afb..a1e84c3 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
@@ -4,10 +4,20 @@ include "root" {
   expose         = true
 }
 
+terraform {
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.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",
+    "../eks-dns",
+    "../eks-grafana",
     "../eks-istio"
   ]
 }
@@ -21,11 +31,29 @@ dependency "eks" {
   }
 }
 
-terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
-  extra_arguments "retry_lock" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20m"]
+dependency "eks-dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_domain    = "mock.example.com"
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
+  }
+}
+
+dependency "eks-grafana" {
+  config_path                             = "../eks-grafana"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    internal_endpoint = { url = "mock.internal.example.com" }
+    namespace         = "mock-namespace-grafana"
+  }
+}
+
+dependency "eks-istio" {
+  config_path                             = "../eks-istio"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    namespace = "mock-namespace-istio"
   }
 }
 
@@ -36,9 +64,12 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_name = dependency.eks.outputs.cluster_name
+  cluster_domain = dependency.eks-dns.outputs.cluster_domain
+  cluster_name   = dependency.eks.outputs.cluster_name
 
   # Kiali Configuration
-  istio_namespace = include.root.inputs.istio_namespace
-  kiali_version   = include.root.inputs.kiali_version
+  grafana_internal_url   = dependency.eks-grafana.outputs.internal_endpoint.url
+  grafana_namespace      = dependency.eks-grafana.outputs.namespace
+  istio_namespace        = dependency.eks-istio.outputs.namepsace
+  kiali_operator_version = include.root.inputs.kiali_operator_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 8ec45cd..b9cff50 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
@@ -15,11 +15,19 @@ dependency "eks" {
   config_path                             = "../eks"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    cluster_name      = include.root.inputs.cluster_name
+    cluster_name      = "mock-cluster"
     oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
   }
 }
 
+dependency "eks-config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    rwo_storage_class = "gp3-encrypted"
+  }
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-loki.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
@@ -35,10 +43,11 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # Cluster Configuration
-  cluster_name = dependency.eks.outputs.cluster_name
+  cluster_name      = dependency.eks.outputs.cluster_name
+  oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
 
   # Loki Configuration
-  loki_version   = include.root.inputs.loki_version
-  retention_days = include.root.inputs.loki_retention_days
-  storage_class  = include.root.inputs.storage_class
+  loki_chart_version = include.root.inputs.loki_chart_version
+  loki_tag           = include.root.inputs.loki_tag
+  rwo_storage_class  = dependency.eks-config.outputs.rwo_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 1657912..ef2851f 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
@@ -37,5 +37,6 @@ inputs = {
   cluster_name = dependency.eks.outputs.cluster_name
 
   # Metrics Server Configuration
-  metrics_server_version = include.root.inputs.metrics_server_version
+  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 1c68911..4a98ee6 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
@@ -28,6 +28,14 @@ dependency "eks" {
   }
 }
 
+dependency "eks-config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    rwo_storage_class = "gp3-encyrpted"
+  }
+}
+
 inputs = {
   # AWS Configuration
   account_id = include.root.inputs.aws_account_id
@@ -39,7 +47,12 @@ inputs = {
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
 
   # Prometheus Configuration
-  prometheus_version = include.root.inputs.prometheus_version
-  retention_days     = include.root.inputs.prometheus_retention_days
-  storage_class      = include.root.inputs.storage_class
+  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
+  rwo_storage_class              = dependency.eks-config.outputs.rwo_storage_class
 }