diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 6356008a..d20e4af3 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -29,7 +29,7 @@ locals {
     karpenter      = "kube-system"
     metrics-server = "kube-system"
     postgresql     = "kube-system"
-    keylcloak      = "kube-system"
+    keycloak       = "kube-system"
     istio          = "istio-system"
     kiali          = "istio-system"
     grafana        = local.telemetry_namespace
@@ -62,7 +62,7 @@ locals {
   cert_manager_controller_tag      = "v${local.cert_manager_version}"
   cert_manager_helm_chart          = "${local.cert_manager_version}"
   cert_manager_startupapicheck_tag = "v${local.cert_manager_version}"
-  cert_manager_version             = "1.16.3"
+  cert_manager_version             = "1.16.4"
   cert_manager_webhook_tag         = "v${local.cert_manager_version}"
 
   ################
@@ -77,7 +77,6 @@ locals {
   download_dashboards_image_tag = "7.85.0"
   grafana_chart_version         = "8.8.5"
   grafana_hostname              = "grafana"
-  grafana_namespace             = "grafana"
   grafana_tag                   = "11.4.0"
   init_chown_data_image_tag     = "1.31.1"
 
@@ -87,6 +86,13 @@ locals {
   karpenter_helm_chart = "1.1.1"
   karpenter_tag        = "1.1.1"
 
+  ################
+  # Keycloak
+  ################
+  keycloak_chart_version = "24.4.10"
+  keycloak_tag           = "26.1.2"
+  keycloak_hostname      = "keycloak"
+
   ################
   # Kiali
   ################
@@ -114,12 +120,12 @@ locals {
   ################
   # PostgreSQL
   ################
-  os_shell_tag = "12"
-  postgres_exporter_tag = "0.16.0"
-  postgresql_repmgr_tag = "17.4.0"
-  pgpool_tag = "4.5.5"
+  os_shell_tag             = "12"
+  postgres_exporter_tag    = "0.16.0"
+  postgresql_repmgr_tag    = "17.4.0"
+  pgpool_tag               = "4.5.5"
   postgresql_chart_version = "15.3.0"
-  postgresql_tag = "17.4.0"
+  postgresql_tag           = "17.4.0"
 
   ################
   # Prometheus
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
index 74573fa0..f221a4b2 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
@@ -21,7 +21,7 @@ dependency "eks" {
   }
 }
 
-dependency "eks-config" {
+dependency "eks_config" {
   config_path                             = "../eks-config"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
@@ -29,6 +29,15 @@ dependency "eks-config" {
   }
 }
 
+dependency "eks_dns" {
+  config_path                             = "../eks-dns"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    cluster_domain    = "mock.example.com"
+    oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
+  }
+}
+
 dependencies {
   paths = [
     "../eks",
@@ -41,24 +50,27 @@ dependencies {
 
 inputs = {
   admin_email    = include.root.inputs.cluster_mailing_list
-  cluster_domain = include.root.inputs.vpc_domain_name
+  cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
-  environment    = include.root.inputs.environment
   namespace      = include.root.inputs.namespaces["keycloak"]
   profile        = include.root.inputs.aws_profile
   region         = include.root.inputs.aws_region
 
   # keycloak config
-  keycloak_hostname     = include.root.inputs.keycloak_hostname
-  keycloak_tag          = include.root.inputs.keycloak_tag
-  keycloak_version      = include.root.inputs.keycloak_chart_version
-  default_storage_class = dependency.eks-config.outputs.rwo_storage_class
+  keycloak_hostname      = include.root.inputs.keycloak_hostname
+  keycloak_tag           = include.root.inputs.keycloak_tag
+  keycloak_chart_version = include.root.inputs.keycloak_chart_version
+  default_storage_class  = dependency.eks_config.outputs.rwo_storage_class
+  service_name           = "keycloak"
+  telemetry_namespace    = include.root.inputs.telemetry_namespace
+
+  # # Database configuration
+  postgresql_host = dependency.eks_postgresql.outputs.internal_endpoint.url
 
-  # Database configuration
-  db_engine        = "aurora-postgresql"
-  db_instance_type = "db.t4g.medium"
-  db_name          = "keycloak"
-  db_user          = "keycloak"
+  db_engine = "postgresql"
+  # db_instance_type = "db.t4g.medium"
+  db_name = "keycloak_db"
+  db_user = "keycloak"
 
   # Project information
   project_name = include.root.inputs.project_name
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl
index 8c61965f..eabc5032 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-postgresql/terragrunt.hcl
@@ -53,16 +53,16 @@ inputs = {
   region     = include.root.inputs.aws_region
 
   # 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
   rwo_storage_class = dependency.eks_config.outputs.rwo_storage_class
 
   # PostgreSQL Configuration
-  service_name       = "postgresql"
-  os_shell_tag         = include.root.inputs.os_shell_tag
+  service_name          = "postgresql"
+  os_shell_tag          = include.root.inputs.os_shell_tag
   postgres_exporter_tag = include.root.inputs.postgres_exporter_tag
-  postgresql_tag      = include.root.inputs.postgresql_tag
+  postgresql_tag        = include.root.inputs.postgresql_tag
   postgresql_repmgr_tag = include.root.inputs.postgresql_repmgr_tag
-  pgpool_tag         = include.root.inputs.pgpool_tag
-  namespace = include.root.inputs.namespaces["postgresql"]
+  pgpool_tag            = include.root.inputs.pgpool_tag
+  namespace             = include.root.inputs.namespaces["postgresql"]
 }