diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
index aaf2071..e215316 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=mcmCluster"
+  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"]
@@ -13,9 +13,9 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-metrics-server" {
-  config_path = "../eks-metrics-server"
-}
+# dependency "eks-metrics-server" {
+#   config_path = "../eks-metrics-server"
+# }
 
 inputs = {
   cluster_name                     = dependency.eks.inputs.cluster_name
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
index 9b316e7..8b288b5 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
@@ -7,7 +7,7 @@ locals {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-configuration.git?ref=mcmCluster"
+  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"]
@@ -18,10 +18,6 @@ dependency "eks" {
   config_path = "../eks"
 }
 
-dependency "eks-karpenter" {
-  config_path = "../eks-karpenter"
-}
-
 inputs = {
   profile      = dependency.eks.inputs.profile
   vpc_id       = dependency.eks.outputs.vpc_id
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
new file mode 100644
index 0000000..4eb9ffa
--- /dev/null
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl
@@ -0,0 +1,30 @@
+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"
+}
+
+dependency "eks-config" {
+  config_path = "../eks-config"
+}
+
+dependency "eks-loki" {
+  config_path = "../eks-loki"
+}
+
+inputs = {
+  profile           = dependency.eks.inputs.profile
+  cluster_name      = dependency.eks.inputs.cluster_name
+  region            = dependency.eks.inputs.region
+  cluster_domain    = dependency.eks.inputs.vpc_domain_name
+  datasources       = {
+    loki = dependency.eks-loki.outputs.gateway_internal_endpoint
+  }
+  rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl.off b/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl.off
deleted file mode 100644
index 344d7d2..0000000
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-grafana/terragrunt.hcl.off
+++ /dev/null
@@ -1,26 +0,0 @@
-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"
-}
-dependency "eks-loki" {
-  config_path = "../eks-loki"
-}
-dependency "eks-tempo" {
-  config_path = "../eks-tempo"
-}
-
-inputs = {
-  profile        = dependency.eks.inputs.profile
-  cluster_name   = dependency.eks.inputs.cluster_name
-  region         = dependency.eks.inputs.region
-  cluster_domain = dependency.eks.inputs.vpc_domain_name
-  # datasources        = dependency.eks-loki.outputs.gateway_internal_endpoint
-  rwo_storage_class = dependency.eks-loki.outputs.rwo_storage_class
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
index 3a75068..2092a91 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
@@ -13,9 +13,10 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-cert-manager" {
-  config_path = "../eks-cert-manager"
-}
+
+# dependency "eks-cert-manager" {
+#   config_path = "../eks-cert-manager"
+# }
 
 inputs = {
   profile             = dependency.eks.inputs.profile
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
index 64afd46..f8702a8 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-karpenter/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-karpenter.git?ref=mcmCluster"
+  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"]
@@ -14,6 +14,11 @@ dependency "eks" {
   config_path = "../eks"
 }
 
+dependency "eks-cert-manager" {
+  config_path  = "../eks-cert-manager"
+  skip_outputs = true
+}
+
 inputs = {
   profile                   = dependency.eks.inputs.profile
   cluster_endpoint          = dependency.eks.outputs.cluster_endpoint
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
index a266af6..86bec28 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
@@ -13,8 +13,10 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-istio" {
-  config_path = "../eks-istio"
+
+dependency "eks-karpenter" {
+  config_path  = "../eks-karpenter"
+  skip_outputs = true
 }
 
 inputs = {
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
index 87c29e8..4481026 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-metrics-server/terragrunt.hcl
@@ -7,7 +7,7 @@ locals {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-metrics-server.git?ref=mcmCluster"
+  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"]
@@ -17,9 +17,9 @@ terraform {
 dependency "eks" {
   config_path = "../eks"
 }
-dependency "eks-config" {
-  config_path = "../eks-config"
-}
+# dependency "eks-config" {
+#   config_path = "../eks-config"
+# }
 
 inputs = {
   profile      = dependency.eks.inputs.profile
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
index b2b7467..c6b99e7 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-prometheus/terragrunt.hcl
@@ -3,7 +3,7 @@ include "root" {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-prometheus.git?ref=mcmCluster"
+  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"]
@@ -14,7 +14,8 @@ dependency "eks" {
   config_path = "../eks"
 }
 dependency "eks-loki" {
-  config_path = "../eks-loki"
+  config_path  = "../eks-loki"
+  skip_outputs = true
 }
 
 inputs = {
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl.off b/lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
similarity index 100%
rename from lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl.off
rename to lab/us-gov-east-1/vpc/_mcmCluster/eks-tempo/terragrunt.hcl
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
index d3d8b0e..341232b 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
@@ -34,7 +34,7 @@ locals {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=ver"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]