diff --git a/lab/_envcommon/aws-provider.hcl b/lab/_envcommon/aws-provider.hcl
deleted file mode 100644
index 18483ac..0000000
--- a/lab/_envcommon/aws-provider.hcl
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl
deleted file mode 100644
index 9de71e8..0000000
--- a/lab/_envcommon/helm-provider.hcl
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index a004d43..0000000
--- a/lab/_envcommon/kubernetes-provider.hcl
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/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 3999e10..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
@@ -25,33 +25,6 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   cluster_name                     = dependency.eks.outputs.cluster_name
   cluster_mailing_list             = dependency.eks.inputs.creator
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 46e04b0..da0ea8b 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
@@ -24,36 +24,33 @@ dependency "eks" {
     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"]
-    cluster_token                                           = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
+    cluster_token                                   = [{ token = "THISISTHETOKENTHATDOESNTEXISTTHEREAREMANYLIKEITBUTHISONEISFORACLUSTER" }]
     vpc_id                                          = "a-vpc-id"
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
+generate "kubectl-provider" {
+  path      = "kubectl-provider.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "kubernetes")}
-provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.cluster_token.token}"
-}
-%{endif}
-%{if contains(local.providers, "helm")}
-provider "helm" {
-  kubernetes {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
+  %{ if dependency.eks.outputs.cluster_name != "a-cluster-name" ~}
+  data "aws_eks_cluster" "kubectl" {
+    name = "${dependency.eks.outputs.cluster_name}"
   }
-}
-%{endif}
-EOF
+  provider "kubectl" {
+    apply_retry_count      = 5
+    host                   = data.aws_eks_cluster.kubectl.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.kubectl.certificate_authority[0].data)
+    load_config_file       = false
+
+    exec {
+      api_version = "client.authentication.k8s.io/v1beta1"
+      command     = "aws"
+      args = ["eks", "get-token", "--cluster-name", "${dependency.eks.outputs.cluster_name}", "--region", "${include.root.inputs.aws_region}"]
+    }
+  }
+  %{ endif ~}
+  EOF
 }
 
 inputs = {
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 e792085..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
@@ -29,33 +29,6 @@ dependency "istio" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   cluster_name      = dependency.eks.inputs.cluster_name
   istio_ingress_lb  = dependency.istio.outputs.istio_ingress_lb
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 efb0710..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
@@ -26,33 +26,6 @@ dependency "eks-loki" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile                       = include.root.inputs.aws_profile
   region                        = include.root.inputs.aws_region
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 0cbd751..fdfc3fb 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
@@ -18,38 +18,12 @@ dependency "eks" {
     cluster_name = "a-cluster-name"
   }
 }
+
 dependency "eks-karpenter" {
   config_path  = "../eks-karpenter"
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile             = include.root.inputs.aws_profile
   region              = include.root.inputs.aws_region
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 6001036..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
@@ -25,33 +25,6 @@ dependency "eks-loki" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile               = include.root.inputs.aws_profile
   region                = include.root.inputs.aws_region
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 3afd731..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
@@ -28,33 +28,6 @@ dependency "eks-config" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile                   = include.root.inputs.aws_profile
   region                    = include.root.inputs.aws_region
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 9f8027b..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
@@ -53,33 +53,6 @@ dependency "eks-grafana" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   kiali_operator_version = include.root.inputs.kiali_operator_version
   kiali_application_version = include.root.inputs.kiali_application_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 b59a73a..70b8b09 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
@@ -30,33 +30,6 @@ dependency "eks-prometheus" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile                         = include.root.inputs.aws_profile
   region                          = include.root.inputs.aws_region
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 2804272..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
@@ -24,33 +24,6 @@ dependency "eks_config" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile                   = include.root.inputs.aws_profile
   cluster_name              = dependency.eks.outputs.cluster_name
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 52078a5..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
@@ -24,33 +24,6 @@ dependency "eks-dns" {
   skip_outputs = true
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   profile                        = include.root.inputs.aws_profile
   region                         = include.root.inputs.aws_region
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 8b26975..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
@@ -32,33 +32,6 @@ dependency "eks-prometheus" {
   }
 }
 
-locals {
-  providers = ["aws", "kubernetes", "helm"]
-}
-
-generate "other-providers" {
-  path      = "other-providers.tf"
-  if_exists = "overwrite"
-  contents  = <<-EOF
-  %{if contains(local.providers, "kubernetes")}
-  provider "kubernetes" {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.cluster_token.token}"
-  }
-  %{endif}
-  %{if contains(local.providers, "helm")}
-  provider "helm" {
-    kubernetes {
-      host                   = "${dependency.eks.outputs.cluster_endpoint}"
-      cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-      token                  = "${dependency.eks.outputs.cluster_token.token}"
-    }
-  }
-  %{endif}
-EOF
-}
-
 inputs = {
   account_id           = include.root.locals.account_id
   profile              = include.root.locals.aws_profile
diff --git a/lab/root.hcl b/lab/root.hcl
index 802d298..7253386 100644
--- a/lab/root.hcl
+++ b/lab/root.hcl
@@ -39,7 +39,7 @@ locals {
   state_table_name    = local.common_vars.locals.state_table_name
   terraform           = local.cluster_vars.locals.terraform
   terragrunt          = local.cluster_vars.locals.terragrunt
-  providers           = ["aws"]
+  module_name         = get_terragrunt_dir()
 }
 
 # Configure Terragrunt to automatically store tfstate files in an S3 bucket
@@ -66,11 +66,10 @@ remote_state {
 }
 
 # Generate an AWS provider block
-generate "providers" {
-  path      = "providers.tf"
+generate "aws-provider" {
+  path      = "aws-provider.tf"
   if_exists = "overwrite"
   contents  = <<-EOF
-%{if contains(local.providers, "aws")}
 provider "aws" {
   region = "${local.aws_region}"
   profile = "${local.aws_profile}"
@@ -92,23 +91,50 @@ provider "aws" {
   # Only these AWS Account IDs may be operated on by this template
   allowed_account_ids = ["${local.account_id}"]
 }
-%{endif}
-%{if contains(local.providers, "kubernetes")}
+EOF
+}
+
+generate "kube-provider" {
+  path      = "kube-provider.tf"
+  if_exists = "overwrite"
+  contents  = <<-EOF
+%{ if startswith(local.module_name, "tfmod-eks-") ~}
+data "aws_eks_cluster" "kube" {
+  name = "${local.cluster_name}"
+}
 provider "kubernetes" {
-  host                   = "${dependency.eks.outputs.cluster_endpoint}"
-  cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-  token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+  host                   = data.aws_eks_cluster.kube.endpoint
+  cluster_ca_certificate = base64decode(data.aws_eks_cluster.kube.certificate_authority[0].data)
+  exec {
+    api_version = "client.authentication.k8s.io/v1beta1"
+    command     = "aws"
+    args = ["eks", "get-token", "--cluster-name", "${local.cluster_name}", "--region", "${local.aws_region}"]
+  }
+}
+%{ endif }
+EOF
+}
+
+generate "helm-provider" {
+  path      = "helm-provider.tf"
+  if_exists = "overwrite"
+  contents  = <<-EOF
+%{ if startswith(local.module_name, "tfmod-eks-") ~}
+data "aws_eks_cluster" "helm" {
+  name = "${local.cluster_name}"
 }
-%{endif}
-%{if contains(local.providers, "helm")}
 provider "helm" {
   kubernetes {
-    host                   = "${dependency.eks.outputs.cluster_endpoint}"
-    cluster_ca_certificate = base64decode("${dependency.eks.outputs.cluster_certificate_authority_data}")
-    token                  = "${dependency.eks.outputs.provider_kubernetes_config.token}"
+    host                   = data.aws_eks_cluster.helm.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.helm.certificate_authority[0].data)
+    exec {
+      api_version = "client.authentication.k8s.io/v1beta1"
+      command     = "aws"
+      args = ["eks", "get-token", "--cluster-name", "${local.cluster_name}", "--region", "${local.aws_region}"]
+    }
   }
 }
-%{endif}
+%{ endif }
 EOF
 }