diff --git a/ansible/files/envoy_config/lds.yaml b/ansible/files/envoy_config/lds.yaml
index 84acfc041..dba85e9de 100644
--- a/ansible/files/envoy_config/lds.yaml
+++ b/ansible/files/envoy_config/lds.yaml
@@ -140,6 +140,7 @@ resources:
                         hint: '%RESPONSE_CODE_DETAILS%'
                       json_format_options:
                         sort_properties: false
+              merge_slashes: true
               route_config:
                 name: route_config_0
                 virtual_hosts:
@@ -247,6 +248,7 @@ resources:
                         route:
                           cluster: admin_api
                           prefix_rewrite: /
+                          timeout: 600s
                       - match:
                           prefix: /customer/v1/privileged/
                         route:
diff --git a/common-nix.vars.pkr.hcl b/common-nix.vars.pkr.hcl
index ae0ef8b05..514af27e4 100644
--- a/common-nix.vars.pkr.hcl
+++ b/common-nix.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.6.1.99"
+postgres-version = "15.6.1.100"
diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
index cc54db365..af712fdba 100644
--- a/common.vars.pkr.hcl
+++ b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.1.81"
+postgres-version = "15.1.1.82"