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 f09013f..98f6509 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
@@ -1,15 +1,9 @@
 terraform {
-#   source = "git@github.e.it.census.gov:terraform-modules/aws-certificates//acmpca-eks-cert-manager"
-  # source = "./cert-mgr.tf"
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
-  
-#   cluster_name  = var.cluster_name
-#   contact_email = var.cluster_mailing_list
-
-#   tags = merge(
-#     local.base_tags,
-#     local.common_tags
-#   )
+  extra_arguments "retry_lock" {
+    commands  = get_terraform_commands_that_need_locking()
+    arguments = ["-lock-timeout=20m"]
+  }
 }
 
 dependency "eks" {
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 0482930..e130bf1 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
@@ -1,19 +1,4 @@
 locals {
-  # In which AWS region are operations being performed
-  # vpc_id                                         = "vpc-0280f77b373744eaa"
-  # profile                                        = "224384469011-lab-dev-gov.inf-admin-t3"
-  # cluster_name                                   = "platform-eng-eks-test"
-  # subnets                                        = [
-  #                                                   "subnet-078b228071c609a50",
-  #                                                   "subnet-02c2250b9ec2dd6a2",
-  #                                                   "subnet-07a6339be3670fb41",
-  #                                                 ]
-  # security_group_all_worker_mgmt_id               = "sg-02b62e91afdbeba6b"
-  # eks_managed_node_groups_autoscaling_group_names = ["eks-eks-platform-eng-eks-test-nodegroup-20240501173536404400000016-3ec79a9c-f002-40c6-8358-29fbacfbb3e8"]
-  
-  # region                                          = "us-gov-east-1"
-  # oidc_provider_arn                               = "arn:aws-us-gov:iam::224384469011:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/7DE08671C3526A48AD5537E814DC2828"
-
   tag_costallocation                              = "census:csvd:platformbaseline"
   region                                          = "us-gov-east-1"
   tags = {
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 6e02208..9bc8a48 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
@@ -6,20 +6,6 @@ terraform {
   }
 }
 
-remote_state {
-  backend     = "s3"
-  generate    = {
-    path      = "backend.tf"
-    if_exists = "overwrite_terragrunt"
-  }
-  config = {
-    bucket         = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1"
-    key            = "platform-eks-test-istio/terraform.tfstate"
-    region         = "us-gov-east-1"
-    encrypt        = true
-  }
-}
-
 dependency "eks" {
   config_path = "../eks"
 }
@@ -27,7 +13,7 @@ dependency "eks" {
 inputs = {
   profile                                         = dependency.eks.inputs.profile
   cluster_name                                    = dependency.eks.inputs.cluster_name
-  region                                          = "us-gov-east-1"
+  region                                          = dependency.eks.inputs.region
   istio_chart_version                             = "1.22.1"
   istio_version                                   = "1.22.1"
 }
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 62a03c5..d414620 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
@@ -6,20 +6,6 @@ terraform {
   }
 }
 
-remote_state {
-  backend     = "s3"
-  generate    = {
-    path      = "backend.tf"
-    if_exists = "overwrite_terragrunt"
-  }
-  config = {
-    bucket         = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1"
-    key            = "platform-eks-test-loki/terraform.tfstate"
-    region         = "us-gov-east-1"
-    encrypt        = true
-  }
-}
-
 dependency "eks" {
   config_path = "../eks"
 }
@@ -28,5 +14,5 @@ inputs = {
   profile                                         = dependency.eks.inputs.profile
   cluster_name                                    = dependency.eks.inputs.cluster_name
   oidc_provider_arn                               = dependency.eks.outputs.oidc_provider_arn
-  region                                          = "us-gov-east-1"
+  region                                          = dependency.eks.inputs.region
 }