diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 31455779..7d186cb4 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -133,6 +133,16 @@ locals {
   metrics_server_helm_chart = "3.12.2"
   metrics_server_tag        = "0.7.2"
 
+  ################
+  # PostgreSQL
+  ################
+  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"
+
   ################
   # Prometheus
   ################
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 1ccfd902..8c61965f 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
@@ -29,6 +29,14 @@ dependency "eks" {
   }
 }
 
+dependency "eks_config" {
+  config_path                             = "../eks-config"
+  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
+  mock_outputs = {
+    rwo_storage_class = "gp3-mock"
+  }
+}
+
 dependency "eks_dns" {
   config_path                             = "../eks-dns"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
@@ -47,10 +55,14 @@ inputs = {
   # Cluster Configuration
   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       = include.root.inputs.postgresql_name
-  postgresql_version = include.root.inputs.postgresql_version
-
+  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_repmgr_tag = include.root.inputs.postgresql_repmgr_tag
+  pgpool_tag         = include.root.inputs.pgpool_tag
   namespace = include.root.inputs.namespaces["postgresql"]
 }