diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index d4d74d9..79c19ad 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -95,6 +95,7 @@ locals {
   ################
   gatekeeper_tag           = "3.18.2"
   gatekeeper_chart_version = "0.1.53"
+  gatekeeper_service_name = "gatekeeper"
 
   ################
   # Grafana
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl
index d369a43..569a355 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-cert-manager/terragrunt.hcl
@@ -47,10 +47,10 @@ dependency "eks" {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
-  eecr_info       = include.root.inputs.eecr_info
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+  eecr_info  = include.root.inputs.eecr_info
 
   # Cluster Configuration
   cluster_name         = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl
index 49fa79c..49e0ea2 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-config/terragrunt.hcl
@@ -50,9 +50,9 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Core Cluster Configuration
   cluster_name                                    = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl
index 3d3672c..62d93af 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-dns/terragrunt.hcl
@@ -53,9 +53,9 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name = include.root.inputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gatekeeper/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gatekeeper/terragrunt.hcl
index 98c4d79..ffddffa 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gatekeeper/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gatekeeper/terragrunt.hcl
@@ -4,6 +4,17 @@ include "root" {
   expose         = true
 }
 
+locals {
+  # Skip this module if disabled
+  skip = !lookup(include.root.locals.is_module_enabled, basename(get_terragrunt_dir()), true)
+}
+
+exclude {
+  if                   = local.skip
+  actions              = ["all_except_output"]
+  exclude_dependencies = false
+}
+
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-gogatekeeper.git?ref=${include.root.inputs.release_version}"
   extra_arguments "retry_lock" {
@@ -33,11 +44,11 @@ dependency "eks-grafana" {
   config_path                             = "../eks-grafana"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    namespace       = "telemetry"
+    namespace = "telemetry"
     internal_endpoint = {
-      hostname = "kubernetes-dashboard.telemetry.svc.cluster.local"
+      hostname    = "kubernetes-dashboard.telemetry.svc.cluster.local"
       port_number = 80
-      url = "http://kubernetes-dashboard.telemetry.svc.cluster.local:80/"
+      url         = "http://kubernetes-dashboard.telemetry.svc.cluster.local:80/"
     }
   }
 }
@@ -46,11 +57,11 @@ dependency "eks-k8s-dashboard" {
   config_path                             = "../eks-k8s-dashboard"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    namespace       = "telemetry"
+    namespace = "telemetry"
     internal_endpoint = {
-      hostname = "kubernetes-dashboard.telemetry.svc.cluster.local"
+      hostname    = "kubernetes-dashboard.telemetry.svc.cluster.local"
       port_number = 80
-      url = "http://kubernetes-dashboard.telemetry.svc.cluster.local:80/"
+      url         = "http://kubernetes-dashboard.telemetry.svc.cluster.local:80/"
     }
     dashboard-user-token = "Iamanextremelylongstring"
   }
@@ -72,11 +83,11 @@ dependency "eks-kiali" {
   config_path                             = "../eks-kiali"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
-    namespace       = "istio-system"
+    namespace = "istio-system"
     internal_endpoint = {
-      hostname = "kiali.telemetry.svc.cluster.local"
+      hostname    = "kiali.telemetry.svc.cluster.local"
       port_number = 80
-      url = "http://kiali.telemetry.svc.cluster.local:80/"
+      url         = "http://kiali.telemetry.svc.cluster.local:80/"
     }
   }
 }
@@ -93,33 +104,39 @@ dependencies {
 }
 
 inputs = {
-  # Base Cluster Config
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+
+  # Cluster Configuration
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
-  profile        = include.root.inputs.aws_profile
 
   # Gatekeeper Standard Config
-  gatekeeper_tag             = include.root.inputs.gatekeeper_tag
-  gatekeeper_version         = include.root.inputs.gatekeeper_chart_version
-  keycloak_ns                = dependency.eks_keycloak.outputs.namespace
-  user_secret                = dependency.eks_keycloak.outputs.user_secret
   client_id                  = dependency.eks_keycloak.outputs.client_id
   client_secret              = dependency.eks_keycloak.outputs.client_secret
+  gogatekeeper_tag           = include.root.inputs.gatekeeper_tag
+  gogatekeeper_chart_version = include.root.inputs.gatekeeper_chart_version
   keycloak_fqdn              = dependency.eks_keycloak.outputs.user_auth_realm
+  keycloak_ns                = dependency.eks_keycloak.outputs.namespace
+  service_name               = include.root.inputs.gatekeeper_service_name
+  user_secret                = dependency.eks_keycloak.outputs.user_secret
 
   # Dashboard Gatekeeper Config 
-  dashboard_service_name     = "dashboard"
-  dashboard_ns               = dependency.eks-k8s-dashboard.outputs.namespace
-  dashboard_url              = dependency.eks-k8s-dashboard.outputs.internal_endpoint.url
-  dashboard_user_token       = dependency.eks-k8s-dashboard.outputs.dashboard-user-token
+  dashboard_ns           = dependency.eks-k8s-dashboard.outputs.namespace
+  dashboard_service_name = "dashboard"
+  dashboard_url          = dependency.eks-k8s-dashboard.outputs.internal_endpoint.url
+  dashboard_user_token   = dependency.eks-k8s-dashboard.outputs.dashboard-user-token
 
   # Grafana Gatekeeper Config 
-  grafana_service_name       = "grafana"
-  grafana_ns                 = dependency.eks-grafana.outputs.namespace
-  grafana_url                = dependency.eks-grafana.outputs.internal_endpoint.url
+  grafana_ns           = dependency.eks-grafana.outputs.namespace
+  grafana_service_name = "grafana"
+  grafana_url          = dependency.eks-grafana.outputs.internal_endpoint.url
 
   # Kaili Gatekeeper Config 
-  kiali_service_name       = "kiali"
-  kiali_ns                 = dependency.eks-kiali.outputs.namespace
-  kiali_url                = dependency.eks-kiali.outputs.internal_endpoint.url
+  kiali_ns           = dependency.eks-kiali.outputs.namespace
+  kiali_service_name = "kiali"
+  kiali_url          = dependency.eks-kiali.outputs.internal_endpoint.url
 }
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
index 25d1b2b..f6a9a49 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
@@ -86,10 +86,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl
index 77bfa9c..fd0ab3e 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-istio/terragrunt.hcl
@@ -42,10 +42,10 @@ dependency "eks" {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl
index bd61ec0..9527e5f 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-k8s-dashboard/terragrunt.hcl
@@ -53,11 +53,11 @@ inputs = {
   account_id = include.root.inputs.aws_account_id
   profile    = include.root.inputs.aws_profile
   region     = include.root.inputs.aws_region
-  eecr_info       = include.root.inputs.eecr_info
+  eecr_info  = include.root.inputs.eecr_info
 
   # Cluster Configuration
-  cluster_domain  = dependency.eks_dns.outputs.cluster_domain
-  cluster_name    = dependency.eks.outputs.cluster_name
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
+  cluster_name   = dependency.eks.outputs.cluster_name
 
   # Dashboard Configuration
   service_name          = include.root.inputs.dashboard_hostname
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl
index f8e3f41..9233255 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-karpenter/terragrunt.hcl
@@ -46,10 +46,10 @@ dependency "eks" {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
-  eecr_info       = include.root.inputs.eecr_info
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
+  eecr_info  = include.root.inputs.eecr_info
 
   # Cluster Configuration
   cluster_endpoint  = dependency.eks.outputs.cluster_endpoint
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
index 7c84d1f..c498000 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
@@ -58,12 +58,12 @@ dependencies {
 }
 
 inputs = {
-  cluster_domain  = dependency.eks_dns.outputs.cluster_domain
-  cluster_name    = dependency.eks.outputs.cluster_name
-  eecr_info       = include.root.inputs.eecr_info
-  namespace       = include.root.inputs.namespaces["keycloak"]
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
+  cluster_name   = dependency.eks.outputs.cluster_name
+  eecr_info      = include.root.inputs.eecr_info
+  namespace      = include.root.inputs.namespaces["keycloak"]
+  profile        = include.root.inputs.aws_profile
+  region         = include.root.inputs.aws_region
 
   # keycloak config
   default_storage_class  = dependency.eks_config.outputs.rwo_storage_class
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl
index 8913def..8f19b76 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-kiali/terragrunt.hcl
@@ -57,7 +57,7 @@ dependency "eks_grafana" {
       port_number = "80"
       url         = "https://grafana.mock.svc.cluster.local:80/"
     }
-    namespace = "grafana"
+    namespace           = "grafana"
     secret_name         = "grafana"
     tempo_datasource_id = "mock-tempo-datasource-id"
   }
@@ -101,10 +101,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_domain     = dependency.eks_dns.outputs.cluster_domain
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl
index 401ad3a..54586f1 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-loki/terragrunt.hcl
@@ -50,10 +50,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl
index 0fa527f..241bbc5 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-metrics-server/terragrunt.hcl
@@ -39,10 +39,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl
index 693ba17..a8a7d7c 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-otel/terragrunt.hcl
@@ -64,10 +64,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Clouster Config
   cluster_name = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl
index 2752527..1cb7f81 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-prometheus/terragrunt.hcl
@@ -51,10 +51,10 @@ dependency "eks_config" {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl
index 6a05943..71dd0a1 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-tempo/terragrunt.hcl
@@ -54,10 +54,10 @@ dependencies {
 
 inputs = {
   # AWS Configuration
-  account_id      = include.root.inputs.aws_account_id
-  eecr_info       = include.root.inputs.eecr_info
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
+  account_id = include.root.inputs.aws_account_id
+  eecr_info  = include.root.inputs.eecr_info
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # Cluster Configuration
   cluster_name      = dependency.eks.outputs.cluster_name