diff --git a/.buildkite/pull-requests.org-wide.json b/.buildkite/pull-requests.org-wide.json
index 38c71e8b3a48..29fe92e4ed5a 100644
--- a/.buildkite/pull-requests.org-wide.json
+++ b/.buildkite/pull-requests.org-wide.json
@@ -73,6 +73,7 @@
         "elastic/logstash-docs",
         "elastic/observability-docs",
         "elastic/observability-robots-playground",
+        "elastic/search-ui",
         "elastic/security-docs",
         "elastic/stack-docs",
         "elastic/tech-content",
diff --git a/conf.yaml b/conf.yaml
index 8203396eefec..ef1f3de4fa61 100644
--- a/conf.yaml
+++ b/conf.yaml
@@ -62,6 +62,7 @@ repos:
     logstash-docs:        https://github.com/elastic/logstash-docs.git
     observability-docs:   https://github.com/elastic/observability-docs.git
     package-spec:         https://github.com/elastic/package-spec.git
+    search-ui:            https://github.com/elastic/search-ui.git
     security-docs:        https://github.com/elastic/security-docs.git
     sense:                https://github.com/elastic/sense.git
     stack-docs:           https://github.com/elastic/stack-docs.git
@@ -79,10 +80,10 @@ contents_title:     Elastic documentation
 #   <key>: &<variable> <value>
 # The keys don't really matter, but by convention the are the same as the variable.
 variables:
-  stackcurrent: &stackcurrent 8.16
-  stacklive: &stacklive [ 8.16, 7.17 ]
+  stackcurrent: &stackcurrent 8.17
+  stacklive: &stacklive [ 8.17, 7.17 ]
 
-  cloudSaasCurrent: &cloudSaasCurrent ms-116
+  cloudSaasCurrent: &cloudSaasCurrent ms-117
 
   mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam
     ms-105: main
@@ -126,6 +127,21 @@ variables:
 
 toc_extra: extra/docs_landing.html
 contents:
+    -   title:          Search UI
+        sections:
+          - title:      Search UI
+            prefix:     en/search-ui
+            current:    main
+            branches:   [ main ]
+            live:       [ main ]
+            index:      docs/index.asciidoc
+            chunk:      3
+            tags:       Search UI/Guide
+            subject:    Search UI
+            sources:
+              -
+                repo:   search-ui
+                path:   docs
     -   title:          Integrations
         sections:
           - title:      Integrations
@@ -2189,8 +2205,12 @@ contents:
             prefix:     en/cloud-on-k8s
             tags:       Kubernetes/Reference
             subject:    ECK
+<<<<<<< HEAD
+            current:    2.16
+=======
             current:    2.15
-            branches:   [ {main: master}, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ]
+>>>>>>> b4e83236 (Add ECK 2.16 (#3138))
+            branches:   [ {main: master}, 2.16, 2.15, 2.14, 2.13, 2.12, 2.11, 2.10, 2.9, 2.8, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0, 1.0-beta, 0.9, 0.8 ]
             index:      docs/index.asciidoc
             chunk:      1
             sources:
diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh
index a274f411b34c..1b98eb0bffb8 100644
--- a/doc_build_aliases.sh
+++ b/doc_build_aliases.sh
@@ -15,6 +15,9 @@ alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/s
 # Integrations
 alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2'
 
+# Search UI
+alias docbldsearchui='$GIT_HOME/docs/build_docs --doc $GIT_HOME/search-ui/docs/index.asciidoc --chunk 3'
+
 # Elasticsearch
 alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1'
 
diff --git a/resources/web/style/base_styles.pcss b/resources/web/style/base_styles.pcss
index 25a72887587d..772c3121a1f9 100644
--- a/resources/web/style/base_styles.pcss
+++ b/resources/web/style/base_styles.pcss
@@ -68,7 +68,7 @@ html {
   }
 
   details[open] {
-    summary {
+    > summary {
       &:before {
         transform: translate(-3.5px, 0px) rotate(90deg);
         transition: .1s ease-in-out;
diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc
index 59dcc33974b0..a0639596a79b 100644
--- a/shared/attributes.asciidoc
+++ b/shared/attributes.asciidoc
@@ -207,6 +207,7 @@ Elastic Cloud
 :ess-skip-section: If you use {ess}, skip this section. {ess} handles these changes for you.
 :api-cloud:  https://www.elastic.co/docs/api/doc/cloud
 :api-ece:    https://www.elastic.co/docs/api/doc/cloud-enterprise
+:api-kibana-serverless:  https://www.elastic.co/docs/api/doc/serverless
 //////////
 Elasticsearch
 //////////
diff --git a/shared/versions/stack/8.16.asciidoc b/shared/versions/stack/8.16.asciidoc
index 0a31434309b1..608968e5f75f 100644
--- a/shared/versions/stack/8.16.asciidoc
+++ b/shared/versions/stack/8.16.asciidoc
@@ -1,12 +1,12 @@
-:version:                8.16.1
+:version:                8.16.2
 ////
 bare_version never includes -alpha or -beta
 ////
-:bare_version:           8.16.1
-:logstash_version:       8.16.1
-:elasticsearch_version:  8.16.1
-:kibana_version:         8.16.1
-:apm_server_version:     8.16.1
+:bare_version:           8.16.2
+:logstash_version:       8.16.2
+:elasticsearch_version:  8.16.2
+:kibana_version:         8.16.2
+:apm_server_version:     8.16.2
 // branch is 8.16 instead of 8.x for long-term linking purposes
 :branch:                 8.16
 :minor-version:          8.16
@@ -29,7 +29,7 @@ release-state can be: released | prerelease | unreleased
 //////////
 is-current-version can be: true | false
 //////////
-:is-current-version:    true
+:is-current-version:    false
 
 //////////
 hide-xpack-tags defaults to "false" (they are shown unless set to "true")
@@ -73,3 +73,4 @@ Synthetics
 API URLs
 ////
 :api-kibana:           https://www.elastic.co/docs/api/doc/kibana/v8
+:api-es:               https://www.elastic.co/docs/api/doc/elasticsearch/v8
\ No newline at end of file
diff --git a/shared/versions/stack/8.17.asciidoc b/shared/versions/stack/8.17.asciidoc
index 5604f6fcd0f5..f1fe11fea663 100644
--- a/shared/versions/stack/8.17.asciidoc
+++ b/shared/versions/stack/8.17.asciidoc
@@ -24,12 +24,12 @@ Keep the :esf_version: attribute value as master.
 //////////
 release-state can be: released | prerelease | unreleased
 //////////
-:release-state:          unreleased
+:release-state:          released
 
 //////////
 is-current-version can be: true | false
 //////////
-:is-current-version:    false
+:is-current-version:    true
 
 //////////
 hide-xpack-tags defaults to "false" (they are shown unless set to "true")
@@ -73,3 +73,4 @@ Synthetics
 API URLs
 ////
 :api-kibana:           https://www.elastic.co/docs/api/doc/kibana/v8
+:api-es:               https://www.elastic.co/docs/api/doc/elasticsearch/v8
\ No newline at end of file
diff --git a/shared/versions/stack/8.x.asciidoc b/shared/versions/stack/8.x.asciidoc
index 8cd7f69e51c2..eb0e3033e5c3 100644
--- a/shared/versions/stack/8.x.asciidoc
+++ b/shared/versions/stack/8.x.asciidoc
@@ -72,3 +72,4 @@ Synthetics
 API URLs
 ////
 :api-kibana:           https://www.elastic.co/docs/api/doc/kibana/v8
+:api-es:               https://www.elastic.co/docs/api/doc/elasticsearch/v8
\ No newline at end of file
diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc
index d3fc2ae4b03b..47861155ea01 100644
--- a/shared/versions/stack/current.asciidoc
+++ b/shared/versions/stack/current.asciidoc
@@ -1 +1 @@
-include::8.16.asciidoc[]
+include::8.17.asciidoc[]
diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc
index 7038d3a95ffd..bda2bd7a1a15 100644
--- a/shared/versions/stack/master.asciidoc
+++ b/shared/versions/stack/master.asciidoc
@@ -72,6 +72,7 @@ Synthetics
 API URLs
 ////
 :api-kibana:           https://www.elastic.co/docs/api/doc/kibana
+:api-es:               https://www.elastic.co/docs/api/doc/elasticsearch
 
 ////
 Feature flags