diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
index 8d3f576..d72924f 100644
--- a/lab/_envcommon/helm-provider.hcl
+++ b/lab/_envcommon/helm-provider.hcl
@@ -1,10 +1,13 @@
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
-  skip_outputs = false
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
+  mock_outputs = {
+    cluster_name = "a-cluster-name"
+  }
 }
 
 inputs = {
-  cluster_name = dependency.eks.inputs.cluster_name
+  cluster_name = dependency.eks.outputs.cluster_name
 }
 
 # Generate a k8s provider block
@@ -12,11 +15,12 @@ generate "helm_provider" {
   path      = "helm-provider.tf"
   if_exists = "overwrite_terragrunt"
   contents  = <<-EOF
+%{if "${dependency.eks.outputs.cluster_name}" != "a-cluster-name" ~}
   data "aws_eks_cluster" "helm" {
-    name = "${dependency.eks.inputs.cluster_name}"
+    name = "${dependency.eks.outputs.cluster_name}"
   }
   data "aws_eks_cluster_auth" "helm" {
-    name = "${dependency.eks.inputs.cluster_name}"
+    name = "${dependency.eks.outputs.cluster_name}"
   }
   provider "helm" {
     kubernetes {
@@ -25,5 +29,6 @@ generate "helm_provider" {
       token                  = data.aws_eks_cluster_auth.helm.token
     }
   }
+%{ endif ~}
 EOF
 }
diff --git a/lab/_envcommon/kube-provider.hcl b/lab/_envcommon/kube-provider.hcl
index 2da5014..17f7665 100644
--- a/lab/_envcommon/kube-provider.hcl
+++ b/lab/_envcommon/kube-provider.hcl
@@ -1,10 +1,13 @@
 dependency "eks" {
   config_path = "${get_original_terragrunt_dir()}/../eks"
-  skip_outputs = false
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
+  mock_outputs = {
+    cluster_name = "a-cluster-name"
+  }
 }
 
 inputs = {
-  cluster_name = dependency.eks.inputs.cluster_name
+  cluster_name = dependency.eks.outputs.cluster_name
 }
 
 # Generate a k8s provider block
@@ -12,16 +15,18 @@ generate "kube_provider" {
   path      = "kube-provider.tf"
   if_exists = "overwrite_terragrunt"
   contents  = <<-EOF
+%{if "${dependency.eks.outputs.cluster_name}" != "a-cluster-name" ~}
   data "aws_eks_cluster" "kube" {
-    name = "${dependency.eks.inputs.cluster_name}"
+    name = "${dependency.eks.outputs.cluster_name}"
   }
   data "aws_eks_cluster_auth" "kube" {
-    name = "${dependency.eks.inputs.cluster_name}"
+    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
   }
+%{ endif ~}
 EOF
 }
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 5eb35e8..e2ff68f 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
@@ -8,15 +8,15 @@ terraform {
 
 dependency "eks" {
   config_path = "../eks"
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
   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_config" {
-  config_path  = "../eks-config"
-  skip_outputs = true
+dependencies {
+  paths = ["../eks-config"]
 }
 
 # locals {
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 197baad..d0dceb9 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
@@ -10,12 +10,14 @@ terraform {
 
 dependency "eks" {
   config_path = "../eks"
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
   mock_outputs = {
     cluster_certificate_authority_data              = [{ data = "THISISAVERYLONGCERTSTRINGTHATGOESHEREFORSURENODYEP" }]
     cluster_endpoint                                = "https://12345ABCDEE42BF9C24D4C362D1DC.sk1.us-gov-east-1.eks.amazonaws.com"
     cluster_name                                    = "a-cluster-name"
     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"
+    release_version                                 = "main"
     security_group_all_worker_mgmt_id               = "sg-00b0000000000000"
     subnets                                         = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"]
     vpc_id                                          = "a-vpc-id"
@@ -25,6 +27,9 @@ dependency "eks" {
 locals {
   helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl"))
   kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl"))
+  # Debug output
+  helm_debug = local.helm
+  kube_debug = local.kube
 }
 
 generate "helm" {
@@ -40,7 +45,7 @@ generate "kube" {
 }
 
 inputs = {
-  cluster_name                      = dependency.eks.inputs.cluster_name
+  cluster_name                      = dependency.eks.outputs.cluster_name
   region                            = dependency.eks.inputs.aws_region
   release_version                   = dependency.eks.inputs.release_version
   security_group_all_worker_mgmt_id = dependency.eks.outputs.security_group_all_worker_mgmt_id
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 b44b5ca..38d5cb3 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,6 +1,6 @@
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=${include.root.inputs.release_version}"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks-dns.git?ref=main"
   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-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
index 9a94380..a92da4a 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,5 +1,5 @@
 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=main"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -7,15 +7,15 @@ terraform {
 }
 
 dependency "eks" {
-  config_path = "../eks"
+  config_path = "${get_original_terragrunt_dir()}/../eks"
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
   mock_outputs = {
     cluster_name = "a-cluster-name"
   }
 }
 
-dependency "eks-karpenter" {
-  config_path  = "../eks-karpenter"
-  skip_outputs = true
+dependencies {
+  paths = ["../eks-karpenter"]
 }
 
 # locals {
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 5b37382..4e5069c 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
@@ -9,6 +9,7 @@ terraform {
 
 dependency "eks" {
   config_path = "../eks"
+  # mock_outputs_allowed_terraform_commands = ["plan", "validate"]
   mock_outputs = {
     cluster_endpoint  = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com"
     cluster_name      = "a-cluster-name"
@@ -18,11 +19,9 @@ dependency "eks" {
   }
 }
 
-dependency "eks-config" {
-  config_path  = "../eks-config"
-  skip_outputs = true
+dependencies {
+  paths = ["../eks-config"]
 }
-
 # locals {
 #   helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl"))
 #   kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl"))
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 5bb79a7..7870b02 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
@@ -11,7 +11,6 @@ terraform {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
   }
-
 }
 
 inputs = {