diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace
index 642d972..8e81bf9 100644
--- a/.github/platform-tg-infra.code-workspace
+++ b/.github/platform-tg-infra.code-workspace
@@ -28,10 +28,6 @@
 			"name": "tfmod-ersi-arcgis",
 			"path": "../../tfmod-ersi-arcgis"
 		},
-		{
-			"name": "tfmod-gogatekeeper",
-			"path": "../../tfmod-gogatekeeper"
-		},
 		{
 			"name": "tfmod-grafana",
 			"path": "../../tfmod-grafana"
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index c63dd16..d42a68b 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -103,7 +103,7 @@ locals {
   grafana_operator_chart_version = "4.9.8"
   grafana_operator_tag           = "5.16.0"
   grafana_tag                    = "11.5.2"
-  os_shell_image_tag             = "12"
+  os_shell_image_tag             = local.utilities_tag
 
   ################
   # Istio
@@ -139,6 +139,7 @@ locals {
   keycloak_username      = "keycloak"
   keycloak_password      = "this is my very secure and totally random password horse battery staple now"
   postgresql_tag         = "17.4.0-debian-12-r2"
+  utilities_tag              = "1.0.3"
 
   ################
   # Kiali
@@ -166,7 +167,7 @@ locals {
   ################
   # PostgreSQL
   ################
-  os_shell_tag             = "12"
+  os_shell_tag             = local.utilities_tag
   postgres_exporter_tag    = "0.16.0"
   postgresql_repmgr_tag    = "17.4.0-alpine"
   pgpool_tag               = "4.5.5"
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl
index a724fcf..0f1f989 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/cluster.hcl
@@ -6,16 +6,17 @@ locals {
   eks_ng_desired_size    = 2
   eks_ng_max_size        = 10
   eks_ng_min_size        = 2
-  organization          = "census:ocio:csvd"
-  finops_project_name   = "csvd_platformbaseline"
-  finops_project_number = "fs0000000078"
-  finops_project_role   = "csvd_platformbaseline_app"
+  organization           = "census:ocio:csvd"
+  finops_project_name    = "csvd_platformbaseline"
+  finops_project_number  = "fs0000000078"
+  finops_project_role    = "csvd_platformbaseline_app"
 
   tags = {
     "slim:schedule" = "8:00-17:00"
     "cluster:size"  = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
   }
   module_enablement_overrides = {
-    "eks-arcgis" = false
+    "eks-arcgis"     = false
+    "eks-postgresql" = false
   }
 }
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gogatekeeper/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gogatekeeper/terragrunt.hcl
deleted file mode 100644
index 7584cb5..0000000
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-gogatekeeper/terragrunt.hcl
+++ /dev/null
@@ -1,92 +0,0 @@
-include "root" {
-  path           = find_in_parent_folders("root.hcl")
-  merge_strategy = "deep"
-  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" {
-    commands  = get_terraform_commands_that_need_locking()
-    arguments = ["-lock-timeout=20s"]
-  }
-}
-
-dependency "eks" {
-  config_path                             = "../eks"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    cluster_name      = "mock-cluster"
-    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
-  }
-}
-
-dependency "eks_dns" {
-  config_path                             = "../eks-dns"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    cluster_domain = "mock.example.com"
-  }
-}
-
-dependency "eks_grafana" {
-  config_path                             = "../eks-grafana"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    public_endpoint = "mock.grafaba.example.com"
-  }
-}
-
-dependency "eks_keycloak" {
-  config_path                             = "../eks-keycloak"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    public_endpoint = "mock.keycloak.example.com"
-    discovery_url   = "mock.keycloak.example.com/auth"
-    client_id       = "mock-client-id"
-    client_secret   = "mock-client-secret"
-  }
-}
-
-dependencies {
-  paths = [
-    "../eks",
-    "../eks-dns",
-    "../eks-grafana",
-    "../eks-keycloak",
-    "../eks-prometheus",
-  ]
-}
-
-inputs = {
-  # Base Cluster Config
-  cluster_domain  = dependency.eks_dns.outputs.cluster_domain
-  eecr_account_id = include.root.inputs.eecr_account_id
-  namespace       = include.root.inputs.namespaces["gogatekeeper"]
-  profile         = include.root.inputs.aws_profile
-  region          = include.root.inputs.aws_region
-
-  # Gatekeeper Config
-  gogatekeeper_tag           = include.root.inputs.gogatekeeper_tag
-  gogatekeeper_chart_version = include.root.inputs.gogatekeeper_chart_version
-  keycloak_discovery_url     = dependency.eks_keycloak.outputs.discovery_url
-
-  # Service Behind Gatekeeper Config
-  service_name        = "test-gc"
-  upstream_url        = dependency.eks_grafana.outputs.public_endpoint
-  redirection_url     = dependency.eks_grafana.outputs.public_endpoint
-  client_id           = dependency.eks_keycloak.outputs.client_id
-  client_secret       = dependency.eks_keycloak.outputs.client_secret
-  keycloak_public_url = dependency.eks_keycloak.outputs.public_endpoint
-}
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 fc885a3..cc0c03b 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
@@ -27,6 +27,7 @@ dependencies {
   paths = [
     "../eks",
     "../eks-cert-manager",
+    "../eks-otel"
   ]
 }
 
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 51def6d..fc97d70 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
@@ -61,12 +61,9 @@ inputs = {
   cluster_domain  = dependency.eks_dns.outputs.cluster_domain
   cluster_name    = dependency.eks.outputs.cluster_name
   eecr_account_id = include.root.inputs.eecr_account_id
-
-  namespace = include.root.inputs.namespaces["keycloak"]
-  # AWS Configuration
-  account_id = include.root.inputs.aws_account_id
-  profile    = include.root.inputs.aws_profile
-  region     = include.root.inputs.aws_region
+  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
@@ -79,6 +76,7 @@ inputs = {
   realm_username         = include.root.inputs.keycloak_username
   service_name           = "keycloak"
   telemetry_namespace    = include.root.inputs.telemetry_namespace
+  admin_email            = include.root.inputs.cluster_mailing_list
 
   # # Database configuration
   keycloak_database = include.root.inputs.keycloak_database
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 8862a26..ede644a 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
@@ -41,7 +41,6 @@ inputs = {
   # AWS Configuration
   account_id      = include.root.inputs.aws_account_id
   eecr_account_id = include.root.inputs.eecr_account_id
-  eecr_profile    = include.root.inputs.eecr_profile
   profile         = include.root.inputs.aws_profile
   region          = include.root.inputs.aws_region
 
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 355fd03..fd7a50c 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
@@ -27,6 +27,7 @@ dependencies {
   paths = [
     "../eks",
     "../eks-config",
+    "../eks-karpenter",
     "../eks-metrics-server",
   ]
 }