diff --git a/data_services/opensearch.tf b/data_services/opensearch.tf
index 335b56d..7d740b6 100644
--- a/data_services/opensearch.tf
+++ b/data_services/opensearch.tf
@@ -23,7 +23,7 @@ resource "aws_security_group_rule" "elasticsearch_ingress" {
 
 resource "aws_opensearch_domain" "elasticsearch" {
   domain_name       = "${local.namespace}-index"
-  engine_version    = "OpenSearch_2.13"
+  engine_version    = "OpenSearch_2.15"
   tags              = local.tags
 
   advanced_options = {
diff --git a/data_services/secrets.tf b/data_services/secrets.tf
index 9424ac4..e295653 100644
--- a/data_services/secrets.tf
+++ b/data_services/secrets.tf
@@ -19,7 +19,7 @@ locals {
       }
     }
 
-    ldap = var.ldap_config
+    ldap = merge(var.ldap_config, { port = tonumber(var.ldap_config["port"]) })
   }
 }
 
diff --git a/data_services/variables.tf b/data_services/variables.tf
index eeb08fe..e66b6f4 100644
--- a/data_services/variables.tf
+++ b/data_services/variables.tf
@@ -1,6 +1,6 @@
 variable "postgres_version" {
   type    = string
-  default = "13.13"
+  default = "13.15"
 }
 
 variable "instance_class" {