diff --git a/serverless/images/individual-role.png b/serverless/images/individual-role.png
index 30c06646..d397e25e 100644
Binary files a/serverless/images/individual-role.png and b/serverless/images/individual-role.png differ
diff --git a/serverless/index-serverless-devtools.asciidoc b/serverless/index-serverless-devtools.asciidoc
index a577215f..61e34db2 100644
--- a/serverless/index-serverless-devtools.asciidoc
+++ b/serverless/index-serverless-devtools.asciidoc
@@ -1,14 +1,14 @@
-[[devtools-developer-tools]]
-== Dev tools
+[role="exclude",id="devtools-developer-tools"]
+= Dev tools
-include::./pages/general-developer-tools.asciidoc[leveloffset=+2]
+include::./pages/general-developer-tools.asciidoc[leveloffset=+1]
-include::./pages/run-api-requests-in-the-console.asciidoc[leveloffset=+2]
+include::./pages/run-api-requests-in-the-console.asciidoc[leveloffset=+1]
-include::./pages/profile-queries-and-aggregations.asciidoc[leveloffset=+2]
+include::./pages/profile-queries-and-aggregations.asciidoc[leveloffset=+1]
-include::./pages/debug-grok-expressions.asciidoc[leveloffset=+2]
+include::./pages/debug-grok-expressions.asciidoc[leveloffset=+1]
-include::./pages/debug-painless-scripts.asciidoc[leveloffset=+2]
+include::./pages/debug-painless-scripts.asciidoc[leveloffset=+1]
-include::./pages/developer-tools-troubleshooting.asciidoc[leveloffset=+2]
+include::./pages/developer-tools-troubleshooting.asciidoc[leveloffset=+1]
diff --git a/serverless/index-serverless-elasticsearch.asciidoc b/serverless/index-serverless-elasticsearch.asciidoc
index a25e8c9c..b1460d7d 100644
--- a/serverless/index-serverless-elasticsearch.asciidoc
+++ b/serverless/index-serverless-elasticsearch.asciidoc
@@ -4,11 +4,6 @@
{es}
++++
-include::./pages/what-is-elasticsearch-serverless.asciidoc[leveloffset=+2]
-include::./pages/serverless-differences.asciidoc[leveloffset=+2]
-
-include::./pages/pricing.asciidoc[leveloffset=+2]
-
include::./pages/get-started.asciidoc[leveloffset=+2]
include::./pages/connecting-to-es-endpoint.asciidoc[leveloffset=+2]
@@ -42,4 +37,8 @@ include::./pages/search-your-data-semantic-search.asciidoc[leveloffset=+3]
include::./pages/explore-your-data.asciidoc[leveloffset=+2]
-include::./pages/search-playground.asciidoc[leveloffset=+2]
\ No newline at end of file
+include::./pages/search-playground.asciidoc[leveloffset=+2]
+
+include::./pages/serverless-differences.asciidoc[leveloffset=+2]
+
+include::./pages/pricing.asciidoc[leveloffset=+2]
diff --git a/serverless/index-serverless-general.asciidoc b/serverless/index-serverless-general.asciidoc
index 210b3d6b..d0c25916 100644
--- a/serverless/index-serverless-general.asciidoc
+++ b/serverless/index-serverless-general.asciidoc
@@ -1,31 +1,14 @@
[[intro]]
-== Welcome to {serverless-full}
+== Elastic Cloud Serverless
-include::{docs-content-root}/serverless/pages/welcome-to-serverless.asciidoc[leveloffset=+2]
+include::./pages/welcome-to-serverless.asciidoc[leveloffset=+2]
-include::./pages/what-is-serverless.asciidoc[leveloffset=+2]
+include::./pages/get-started-general.asciidoc[leveloffset=+2]
include::./pages/sign-up.asciidoc[leveloffset=+2]
-include::./pages/manage-org.asciidoc[leveloffset=+2]
-include::./pages/manage-access-to-org.asciidoc[leveloffset=+3]
-include::./pages/manage-access-to-org-user-roles.asciidoc[leveloffset=+3]
-include::./pages/manage-access-to-org-from-existing-account.asciidoc[leveloffset=+3]
-
-include::./pages/manage-your-project.asciidoc[leveloffset=+2]
-include::./pages/manage-your-project-rest-api.asciidoc[leveloffset=+3]
-
-include::./pages/manage-billing.asciidoc[leveloffset=+2]
-include::./pages/manage-billing-check-subscription.asciidoc[leveloffset=+3]
-include::./pages/manage-billing-monitor-usage.asciidoc[leveloffset=+3]
-include::./pages/manage-billing-history.asciidoc[leveloffset=+3]
-include::./pages/manage-billing-pricing-model.asciidoc[leveloffset=+3]
-include::./pages/manage-billing-stop-project.asciidoc[leveloffset=+3]
-
include::./pages/service-status.asciidoc[leveloffset=+2]
-include::./pages/user-profile.asciidoc[leveloffset=+2]
-
include::./pages/cloud-regions.asciidoc[leveloffset=+2]
-include::./pages/ml-nlp-auto-scale.asciidoc[leveloffset=+2]
+
diff --git a/serverless/index-serverless-project-settings.asciidoc b/serverless/index-serverless-project-settings.asciidoc
index 113d0dea..7240234a 100644
--- a/serverless/index-serverless-project-settings.asciidoc
+++ b/serverless/index-serverless-project-settings.asciidoc
@@ -1,27 +1,50 @@
[[project-and-management-settings]]
-== Project and management settings
+== Manage your project
+
+
include::./pages/project-and-management-settings.asciidoc[leveloffset=+2]
-include::./pages/project-settings.asciidoc[leveloffset=+2]
-include::./pages/api-keys.asciidoc[leveloffset=+3]
-include::./pages/action-connectors.asciidoc[leveloffset=+3]
+include::./pages/ml-nlp-auto-scale.asciidoc[leveloffset=+2]
+include::./pages/manage-your-project.asciidoc[leveloffset=+2]
+include::./pages/manage-your-project-rest-api.asciidoc[leveloffset=+3]
+
+include::./index-serverless-devtools.asciidoc[leveloffset=+2]
+
+include::./pages/project-settings-access.asciidoc[leveloffset=+2]
+include::./pages/manage-org.asciidoc[leveloffset=+3]
include::./pages/custom-roles.asciidoc[leveloffset=+3]
-include::./pages/data-views.asciidoc[leveloffset=+3]
-include::./pages/files.asciidoc[leveloffset=+3]
+include::./pages/api-keys.asciidoc[leveloffset=+3]
+
+include::./pages/project-settings-data.asciidoc[leveloffset=+2]
+include::./pages/integrations.asciidoc[leveloffset=+3]
+include::./pages/fleet-and-elastic-agent.asciidoc[leveloffset=+3]
include::./pages/index-management.asciidoc[leveloffset=+3]
+include::./pages/data-views.asciidoc[leveloffset=+3]
+include::./pages/machine-learning.asciidoc[leveloffset=+3]
include::./pages/ingest-pipelines.asciidoc[leveloffset=+3]
include::./pages/logstash-pipelines.asciidoc[leveloffset=+3]
-include::./pages/machine-learning.asciidoc[leveloffset=+3]
-include::./pages/maintenance-windows.asciidoc[leveloffset=+3]
-include::./pages/maps.asciidoc[leveloffset=+3]
+include::./pages/transforms.asciidoc[leveloffset=+3]
+
+include::./pages/project-settings-content.asciidoc[leveloffset=+2]
+include::./pages/spaces.asciidoc[leveloffset=+3]
include::./pages/reports.asciidoc[leveloffset=+3]
-include::./pages/rules.asciidoc[leveloffset=+3]
include::./pages/saved-objects.asciidoc[leveloffset=+3]
-include::./pages/spaces.asciidoc[leveloffset=+3]
+include::./pages/files.asciidoc[leveloffset=+3]
+include::./pages/maps.asciidoc[leveloffset=+3]
include::./pages/tags.asciidoc[leveloffset=+3]
-include::./pages/transforms.asciidoc[leveloffset=+3]
+include::./pages/visualize-library.asciidoc[leveloffset=+3]
+
+include::./pages/project-settings-alerts.asciidoc[leveloffset=+2]
+include::./pages/rules.asciidoc[leveloffset=+3]
+include::./pages/action-connectors.asciidoc[leveloffset=+3]
+include::./pages/maintenance-windows.asciidoc[leveloffset=+3]
-include::./pages/integrations.asciidoc[leveloffset=+2]
+//include::./pages/project-settings.asciidoc[leveloffset=+2]
-include::./pages/fleet-and-elastic-agent.asciidoc[leveloffset=+2]
+include::./pages/manage-billing.asciidoc[leveloffset=+2]
+include::./pages/manage-billing-check-subscription.asciidoc[leveloffset=+3]
+include::./pages/manage-billing-monitor-usage.asciidoc[leveloffset=+3]
+include::./pages/manage-billing-history.asciidoc[leveloffset=+3]
+include::./pages/manage-billing-pricing-model.asciidoc[leveloffset=+3]
+include::./pages/manage-billing-stop-project.asciidoc[leveloffset=+3]
\ No newline at end of file
diff --git a/serverless/index.asciidoc b/serverless/index.asciidoc
index b53707a6..167a877b 100644
--- a/serverless/index.asciidoc
+++ b/serverless/index.asciidoc
@@ -18,5 +18,5 @@ include::./index-serverless-general.asciidoc[]
include::./index-serverless-elasticsearch.asciidoc[]
include::{observability-serverless}/index.asciidoc[]
include::{security-serverless}/index.asciidoc[]
-include::./index-serverless-devtools.asciidoc[]
include::./index-serverless-project-settings.asciidoc[]
+
diff --git a/serverless/pages/custom-roles.asciidoc b/serverless/pages/custom-roles.asciidoc
index 57f3c80a..4bd795f0 100644
--- a/serverless/pages/custom-roles.asciidoc
+++ b/serverless/pages/custom-roles.asciidoc
@@ -12,9 +12,9 @@ ifdef::serverlessCustomRoles[]
This content applies to: {es-badge} {sec-badge}
-The built-in <> and <> are great for getting started with {serverless-full}, and for system administrators who do not need more restrictive access.
+The built-in <> and <> are great for getting started with {serverless-full}, and for system administrators who do not need more restrictive access.
-As an administrator, however, you have the ability to create your own roles to describe exactly the kind of access your users should have within a specific project.
+As an administrator, however, can create roles for users with the access they need within specific projects.
For example, you might create a marketing_user role, which you then assign to all users in your marketing department.
This role would grant access to all of the necessary data and features for this team to be successful, without granting them access they don't require.
diff --git a/serverless/pages/explore-your-data.asciidoc b/serverless/pages/explore-your-data.asciidoc
index b274f114..ea4edc9a 100644
--- a/serverless/pages/explore-your-data.asciidoc
+++ b/serverless/pages/explore-your-data.asciidoc
@@ -18,6 +18,7 @@ They are documented in the {es} and {kib} core documentation.
{ref}/search-aggregations.html[Aggregations]::
Use aggregations in your https://www.elastic.co/docs/api/doc/elasticsearch-serverless/operation/operation-search#operation-search-body-application-json-aggregations[`_search` API] requests to summarize your data as metrics, statistics, or other analytics.
+[[elasticsearch-explore-your-data-discover-your-data]]
{kibana-ref}/discover.html[Discover]::
Use the **Discover** UI to quickly search and filter your data, get information about the structure of the fields, and display your findings in a visualization.
+
@@ -25,6 +26,7 @@ Use the **Discover** UI to quickly search and filter your data, get information
[discrete]
[discrete]
+[[elasticsearch-explore-your-data-visualizations-save-to-the-visualize-library]]
== Visualization
{kibana-ref}/dashboard.html[Dashboards]::
diff --git a/serverless/pages/get-started-general.asciidoc b/serverless/pages/get-started-general.asciidoc
new file mode 100644
index 00000000..4b8c3b89
--- /dev/null
+++ b/serverless/pages/get-started-general.asciidoc
@@ -0,0 +1,37 @@
+[[serverless-get-started]]
+= Get started
+
+There are two options to create serverless projects:
+
+* If you are a new user, https://cloud.elastic.co/serverless-registration[sign up for a free 14-day trial] to create a serverless project. For more information about the Elastic Cloud trials, check <>.
+
+* If you are an existing customer, https://cloud.elastic.co/login[log in to Elastic Cloud]. On the home page, you will see a new option to create serverless projects.
+
+Choose the type of project that matches your needs and we'll help you get started with our solution guides.
+
+[cols="1,1"]
+|===
+|
+|
+
+| image:https://www.elastic.co/docs/assets/images/elasticsearch.png[width=150]
+a| [.card-title]#Elasticsearch# +
+Build custom search applications with Elasticsearch.
+
+<>
+
+| image:https://www.elastic.co/docs/assets/images/observability.png[width=150]
+a| [.card-title]#Observability# +
+Monitor applications and systems with Elastic Observability.
+
+<>
+
+| image:https://www.elastic.co/docs/assets/images/security.png[width=150]
+a| [.card-title]#Security# +
+Detect, investigate, and respond to threats with Elastic Security.
+
+<>
+
+|
+|
+|===
diff --git a/serverless/pages/manage-access-to-org-from-existing-account.asciidoc b/serverless/pages/manage-access-to-org-from-existing-account.asciidoc
deleted file mode 100644
index fd5ec2f2..00000000
--- a/serverless/pages/manage-access-to-org-from-existing-account.asciidoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[[general-join-organization-from-existing-cloud-account]]
-= Join an organization from an existing Elastic Cloud account
-
-// :description: Join a new organization and bring over your projects.
-// :keywords: serverless, general, organization, join, how to
-
-If you already belong to an organization, and you want to join a new one, it is currently not possible to bring your projects over to the new organization.
-
-If you want to join a new project, follow these steps:
-
-. Make sure you do not have active projects before you leave your current organization.
-. Delete your projects and clear any bills.
-. Leave your current organization.
-. Ask the administrator to invite you to the organization you want to join.
-. Accept the invitation that you will get by email.
diff --git a/serverless/pages/manage-access-to-org-user-roles.asciidoc b/serverless/pages/manage-access-to-org-user-roles.asciidoc
deleted file mode 100644
index 9463d831..00000000
--- a/serverless/pages/manage-access-to-org-user-roles.asciidoc
+++ /dev/null
@@ -1,76 +0,0 @@
-[[general-assign-user-roles]]
-= Assign user roles and privileges
-
-// :description: Manage the predefined set of roles and privileges for all your projects.
-// :keywords: serverless, general, organization, roles, how to
-
-Within an organization, users can have one or more roles and each role grants specific privileges.
-
-You must assign user roles when you <>.
-To subsequently edit the roles assigned to a user:
-
-. Go to the user icon on the header bar and select **Organization**.
-. Find the user on the **Members** tab of the **Organization** page. Click the member name to view and edit its roles.
-
-[discrete]
-[[general-assign-user-roles-organization-level-roles]]
-== Organization-level roles
-
-* **Organization owner**. Can manage all roles under the organization and has full access to all serverless projects, organization-level details, billing details, and subscription levels. This role is assigned by default to the person who created the organization.
-* **Billing admin**. Has access to all invoices and payment methods. Can make subscription changes.
-
-[discrete]
-[[general-assign-user-roles-instance-access-roles]]
-== Instance access roles
-
-Each serverless project type has a set of predefined roles that you can assign to your organization members.
-You can assign the predefined roles:
-
-* globally, for all projects of the same type ({es-serverless}, {observability}, or {elastic-sec}). In this case, the role will also apply to new projects created later.
-* individually, for specific projects only. To do that, you have to set the **Role for all** field of that specific project type to **None**.
-
-For example, you can assign a user the developer role for a specific {es-serverless} project:
-
-[role="screenshot"]
-image::images/individual-role.png[Individual role]
-
-ifdef::serverlessCustomRoles[]
-
-You can also optionally <>.
-To assign a custom role to users, go to "Instance access roles" and select it from the list under the specific project it was created in.
-
-endif::[]
-
-[discrete]
-[[general-assign-user-roles-es]]
-=== {es}
-
-* **Admin**. Has full access to project management, properties, and security privileges. Admins log into projects with superuser role privileges.
-* **Developer**. Creates API keys, indices, data streams, adds connectors, and builds visualizations.
-* **Viewer**. Has read-only access to project details, data, and features.
-
-[discrete]
-[[general-assign-user-roles-observability]]
-=== {observability}
-
-* **Admin**. Has full access to project management, properties, and security privileges. Admins log into projects with superuser role privileges.
-* **Editor**. Configures all Observability projects. Has read-only access to data indices. Has full access to all project features.
-* **Viewer**. Has read-only access to project details, data, and features.
-
-[discrete]
-[[general-assign-user-roles-security]]
-=== {elastic-sec}
-
-* **Admin**. Has full access to project management, properties, and security privileges. Admins log into projects with superuser role privileges.
-* **Editor**. Configures all Security projects. Has read-only access to data indices. Has full access to all project features.
-* **Viewer**. Has read-only access to project details, data, and features.
-* **Tier 1 analyst**. Ideal for initial alert triage. General read access, can create dashboards and visualizations.
-* **Tier 2 analyst**. Ideal for alert triage and beginning the investigation process. Can create cases.
-* **Tier 3 analyst**. Deeper investigation capabilities. Access to rules, lists, cases, Osquery, and response actions.
-* **Threat intelligence analyst**. Access to alerts, investigation tools, and intelligence pages.
-* **Rule author**. Access to detection engineering and rule creation. Can create rules from available data sources and add exceptions to reduce false positives.
-* **SOC manager**. Access to alerts, cases, investigation tools, endpoint policy management, and response actions.
-* **Endpoint operations analyst**. Access to endpoint response actions. Can manage endpoint policies, {fleet}, and integrations.
-* **Platform engineer**. Access to {fleet}, integrations, endpoints, and detection content.
-* **Detections admin**. All available detection engine permissions to include creating rule actions, such as notifications to third-party systems.
-* **Endpoint policy manager**. Access to endpoint policy management and related artifacts. Can manage {fleet} and integrations.
diff --git a/serverless/pages/manage-access-to-org.asciidoc b/serverless/pages/manage-access-to-org.asciidoc
deleted file mode 100644
index b0d0108c..00000000
--- a/serverless/pages/manage-access-to-org.asciidoc
+++ /dev/null
@@ -1,32 +0,0 @@
-[[general-manage-access-to-organization]]
-= Invite your team
-
-// :description: Add members to your organization and projects.
-// :keywords: serverless, general, organization, overview
-
-To allow other users to interact with your projects, you must invite them to join your organization and grant them access to your organization resources and instances.
-
-Alternatively, {cloud}/ec-saml-sso.html[configure {ecloud} SAML SSO] to enable your organization members to join the {ecloud} organization automatically. preview:[]
-
-. Go to the user icon on the header bar and select **Organization**.
-. Click **Invite members**.
-+
-You can add multiple members by entering their email addresses separated by a space.
-+
-You can grant access to all projects of the same type with a unique role, or select individual roles for specific projects.
-For more details about roles, refer to <>.
-. Click **Send invites**.
-+
-Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation. If they do not join within that period, you will have to send a new invitation.
-
-On the **Members** tab of the **Organization** page, you can view the list of current members, their status and role.
-
-In the **Actions** column, click the three dots to edit a member’s role or revoke the invite.
-
-[discrete]
-[[general-manage-access-to-organization-leave-an-organization]]
-== Leave an organization
-
-On the **Organization** page, click **Leave organization**.
-
-If you're the only user in the organization, you can only leave if you have deleted all your projects and don't have any pending bills.
diff --git a/serverless/pages/manage-billing.asciidoc b/serverless/pages/manage-billing.asciidoc
index 1d70c614..7a1a9a94 100644
--- a/serverless/pages/manage-billing.asciidoc
+++ b/serverless/pages/manage-billing.asciidoc
@@ -5,10 +5,10 @@
// :keywords: serverless, general, billing, overview
++++
-Manage billing
+Billing
++++
-You can manage the billing details of your organization directly from the Elastic Cloud console.
+Manage the billing details of your organization directly from the Elastic Cloud console. Bills are invoiced according to the billing contact and details that you set for your organization.
. Navigate to https://cloud.elastic.co/[cloud.elastic.co] and log in to your Elastic Cloud account.
. Go to the user icon on the header bar and select **Billing**.
@@ -22,3 +22,4 @@ From the **Billing pages**, you can perform the following tasks:
If you have a project that you're no longer using, refer to <>.
To learn about the serverless pricing model, refer to <> and our https://www.elastic.co/pricing/serverless-search[pricing page].
+
diff --git a/serverless/pages/manage-org.asciidoc b/serverless/pages/manage-org.asciidoc
index a65f809b..48e09cfa 100644
--- a/serverless/pages/manage-org.asciidoc
+++ b/serverless/pages/manage-org.asciidoc
@@ -1,13 +1,144 @@
[[general-manage-organization]]
-= Manage your organization
+= Manage users and roles
-// :description: Manage your instances, users, and settings.
+// :description: Manage your Elastic Cloud organization.
// :keywords: serverless, general, organization, overview
-When you sign up to Elastic Cloud, you create an **organization**.
+//An **organization** is the umbrella for all of your {ecloud} resources, including hosted deployments and serverless projects, users, and account settings. When you sign up to {ecloud}, you create an organization.
-This organization is the umbrella for all of your Elastic Cloud resources, users, and account settings. Every organization has a unique identifier. Bills are invoiced according to the billing contact and details that you set for your organization.
+In this article, learn how to:
-* <>: Add members to your organization and projects.
-* <>: Configure the billing details of your organization.
-* <>: Configure project-wide features and usage.
+* <>: Invite users in your organization to access serverless projects and specify their roles.
+* <>: Assign predefined roles to users in your organization.
+* <>: Join a new organization and bring over your projects.
+* <>: Leave an organization.
+
+[discrete]
+[[general-manage-access-to-organization]]
+== Invite your team
+
+// :description: Add members to your organization and projects.
+// :keywords: serverless, general, organization, overview
+
+To allow other users to interact with your projects, you must invite them to join your organization and grant them access to your organization resources and instances.
+
+Alternatively, {cloud}/ec-saml-sso.html[configure {ecloud} SAML SSO] to enable your organization members to join the {ecloud} organization automatically. preview:[]
+
+. Go to the user icon on the header bar and select **Organization**.
+. On the **Members** page, click **Invite members**.
+. Enter the email addresses of the users you want to invite in the textbox.
++
+To add multiple members, enter the member email addresses, separated by a space.
++
+Grant access to all projects of the same type with a unique role, or select individual roles for specific projects.
+For more details about roles, refer to <>.
+. Click **Send invites**.
++
+Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation before it expires. If the invite has expired, an admin can resend the invitation.
+
+On the **Members** tab of the **Organization** page, view the list of current members, including status and role.
+
+In the **Actions** column, click the three dots to edit a member's role or revoke the invite.
+
+[discrete]
+[[general-assign-user-roles]]
+== Assign user roles and privileges
+
+Within an organization, users can have one or more roles and each role grants specific privileges.
+
+You must assign user roles when you <>.
+To subsequently edit the roles assigned to a user:
+
+. Go to the user icon on the header bar and select **Organization**.
+. Find the user on the **Members** tab of the **Organization** page. Click the member name to view and edit its roles.
+
+There are two types of roles you can assign to users:
+
+* **Oranization-level roles:** These roles apply to the entire organization and are not specific to any serverless project or hosted deployment.
+* **Instance access roles:** These roles are specific to each serverless project or hosted deployment.
+
+[discrete]
+[[general-assign-user-roles-organization-level-roles]]
+=== Organization-level roles
+
+* **Organization owner**. Can manage all roles under the organization and has full access to all serverless projects, organization-level details, billing details, and subscription levels. This role is assigned by default to the person who created the organization.
+* **Billing admin**. Has access to all invoices and payment methods. Can make subscription changes.
+
+[discrete]
+[[general-assign-user-roles-instance-access-roles]]
+=== Instance access roles
+
+Each serverless project type has a set of predefined roles that you can assign to your organization members.
+To assign the predefined roles:
+
+* globally, for all projects of the same type ({es-serverless}, {observability}, or {elastic-sec}). In this case, the role will also apply to new projects created later.
+* individually, for specific projects only. To do that, you have to set the **Role for all** field of that specific project type to **None**.
+
+For example, assign a user the developer role for a specific {es-serverless} project:
+
+[role="screenshot"]
+image::images/individual-role.png[Individual role]
+
+ifdef::serverlessCustomRoles[]
+
+You can optionally <>.
+To assign a custom role to users, go to "Instance access roles" and select it from the list under the specific project it was created in.
+
+endif::[]
+
+[discrete]
+[[general-assign-user-roles-table]]
+|===
+|Name |Description |Available
+
+|Admin |Has full access to project management, properties, and security privileges. Admins log into projects with superuser role privileges. |{es-badge}{obs-badge}{sec-badge}
+
+|Developer |Creates API keys, indices, data streams, adds connectors, and builds visualizations. |{es-badge}
+
+|Viewer |Has read-only access to project details, data, and features. |{es-badge}{obs-badge}{sec-badge}
+
+|Editor |Configures all Observability or Security projects. Has read-only access to data indices. Has full access to all project features. |{obs-badge}{sec-badge}
+
+|Tier 1 analyst |Ideal for initial alert triage. General read access, can create dashboards and visualizations. |{sec-badge}
+
+|Tier 2 analyst |Ideal for alert triage and beginning the investigation process. Can create cases. |{sec-badge}
+
+|Tier 3 analyst |Deeper investigation capabilities. Access to rules, lists, cases, Osquery, and response actions. |{sec-badge}
+
+|Threat intelligence analyst |Access to alerts, investigation tools, and intelligence pages. |{sec-badge}
+
+|Rule author |Access to detection engineering and rule creation. Can create rules from available data sources and add exceptions to reduce false positives. |{sec-badge}
+
+|SOC manager |Access to alerts, cases, investigation tools, endpoint policy management, and response actions. |{sec-badge}
+
+|Endpoint operations analyst |Access to endpoint response actions. Can manage endpoint policies, {fleet}, and integrations. |{sec-badge}
+
+|Platform engineer |Access to {fleet}, integrations, endpoints, and detection content. |{sec-badge}
+
+|Detections admin |All available detection engine permissions to include creating rule actions, such as notifications to third-party systems. |{sec-badge}
+
+|Endpoint policy manager |Access to endpoint policy management and related artifacts. Can manage {fleet} and integrations. |{sec-badge}
+|===
+
+
+[discrete]
+[[general-leave-an-organization]]
+== Leave an organization
+
+On the **Organization** page, click **Leave organization**.
+
+If you're the only user in the organization, you are able to leave only when you have deleted all projects and don't have any pending bills.
+
+[discrete]
+[[general-join-organization-from-existing-cloud-account]]
+== Join an organization from an existing Elastic Cloud account
+
+If you already belong to an organization, and you want to join a new one you will need to leave your existing organzation.
+
+If you want to join a new organization, follow these steps:
+
+. Make sure you do not have active projects or deployments before you leave your current organization.
+. Delete your projects and clear any bills.
+. Leave your current organization.
+. Ask the administrator to invite you to the organization you want to join.
+. Accept the invitation that you will get by email.
diff --git a/serverless/pages/manage-your-project.asciidoc b/serverless/pages/manage-your-project.asciidoc
index ffa9a0d4..144956f9 100644
--- a/serverless/pages/manage-your-project.asciidoc
+++ b/serverless/pages/manage-your-project.asciidoc
@@ -1,21 +1,27 @@
[[elasticsearch-manage-project]]
-= Manage your projects
+= Manage performance and general settings
// :description: Configure project-wide features and usage.
// :keywords: serverless, elasticsearch, project, manage
-To manage a project:
+++++
+Performance and general settings
+++++
+
+{serverless-full} projects are fully managed and automatically scaled by Elastic. You have the option of {es}, {observability}, or {elastic-sec} for your project.
+
+Your project's performance and general data retention are controlled by the **Search AI Lake settings**. To manage these settings:
. Navigate to https://cloud.elastic.co/[cloud.elastic.co].
. Log in to your Elastic Cloud account.
. Select your project from the **Serverless projects** panel and click **Manage**.
-From the project page, you can:
+//From the project page, you can:
-* **Rename your project**. In the **Overview** section, click **Edit** next to the project's name.
-* **Manage data and integrations**. Update your project data, including storage settings, indices, and data views, directly in your project.
-* **Manage API keys**. Access your project and interact with its data programmatically using {es} APIs.
-* **Manage members**. Add members and manage their access to this project or other resources of your organization.
+//* **Rename your project**. In the **Overview** section, click **Edit** next to the project's name.
+//* **Manage data and integrations**. Update your project data, including storage settings, indices, and data views, directly in your project.
+//* **Manage API keys**. Access your project and interact with its data programmatically using {es} APIs.
+//* **Manage members**. Add members and manage their access to this project or other resources of your organization.
[discrete]
[[elasticsearch-manage-project-search-ai-lake-settings]]
diff --git a/serverless/pages/ml-nlp-auto-scale.asciidoc b/serverless/pages/ml-nlp-auto-scale.asciidoc
index 56f423f1..d13ac01a 100644
--- a/serverless/pages/ml-nlp-auto-scale.asciidoc
+++ b/serverless/pages/ml-nlp-auto-scale.asciidoc
@@ -3,6 +3,8 @@
// :keywords: serverless
+This content applies to: {es-badge} {obs-badge} {sec-badge}
+
You can enable autoscaling for each of your trained model deployments.
Autoscaling allows {es} to automatically adjust the resources the model deployment can use based on the workload demand.
diff --git a/serverless/pages/project-and-management-settings.asciidoc b/serverless/pages/project-and-management-settings.asciidoc
index 4cf44b62..3a33d851 100644
--- a/serverless/pages/project-and-management-settings.asciidoc
+++ b/serverless/pages/project-and-management-settings.asciidoc
@@ -1,6 +1,7 @@
// :description: Learn about capabilities available in multiple serverless solutions.
// :keywords: serverless, observability, security, elasticsearch, overview
+[[project-settings]]
The documentation in this section describes shared capabilities that are available in multiple solutions.
Look for the doc badge on each page to see if the page is valid for your solution:
diff --git a/serverless/pages/project-settings-access.asciidoc b/serverless/pages/project-settings-access.asciidoc
new file mode 100644
index 00000000..e5b5e89d
--- /dev/null
+++ b/serverless/pages/project-settings-access.asciidoc
@@ -0,0 +1,32 @@
+[[project-settings-access]]
+= Manage access
+
+// :description: Manage your indices, data views, saved objects, settings, and more from a central location in Elastic.
+// :keywords: serverless, management, overview
+
+++++
+Access
+++++
+
+Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
+You can also open Management by using the {kibana-ref}/kibana-concepts-analysts.html#_finding_your_apps_and_objects[global search field].
+
+Access to individual features is governed by Elastic user roles.
+Consult your administrator if you do not have the appropriate access.
+To learn more about roles, refer to <>.
+
+|===
+| Feature | Description | Available in
+
+| <>
+| Invite and manage your team's access to your organization.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Create and manage keys that can interact with your project's data.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Create and manage custom roles for your users.
+| {es-badge}{sec-badge}
+|===
diff --git a/serverless/pages/project-settings-alerts.asciidoc b/serverless/pages/project-settings-alerts.asciidoc
new file mode 100644
index 00000000..a25c552c
--- /dev/null
+++ b/serverless/pages/project-settings-alerts.asciidoc
@@ -0,0 +1,36 @@
+[[project-settings-alerts]]
+= Manage alerts and insights
+
+// :description: Manage your indices, data views, saved objects, settings, and more from a central location in Elastic.
+// :keywords: serverless, management, overview
+
+++++
+Alerts and insights
+++++
+
+Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
+You can also open Management by using the {kibana-ref}/kibana-concepts-analysts.html#_finding_your_apps_and_objects[global search field].
+
+Access to individual features is governed by Elastic user roles.
+Consult your administrator if you do not have the appropriate access.
+To learn more about roles, refer to <>.
+
+|===
+| Feature | Description | Available in
+
+| <>
+| Create and manage reusable connectors for triggering actions.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Suppress rule notifications for scheduled periods of time.
+| {obs-badge}{sec-badge}
+
+| <>
+| Create and manage rules that generate alerts.
+| {es-badge}
+
+| <>
+| Manage entity risk scoring, and preview risky entities.
+| {sec-badge}
+|===
diff --git a/serverless/pages/project-settings-content.asciidoc b/serverless/pages/project-settings-content.asciidoc
new file mode 100644
index 00000000..8ac871d9
--- /dev/null
+++ b/serverless/pages/project-settings-content.asciidoc
@@ -0,0 +1,53 @@
+[[project-settings-content]]
+= Manage project content
+
+// :description: Manage your indices, data views, saved objects, settings, and more from a central location in Elastic.
+// :keywords: serverless, management, overview
+
+++++
+Content
+++++
+
+Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
+You can also open Management by using the {kibana-ref}/kibana-concepts-analysts.html#_finding_your_apps_and_objects[global search field].
+
+Access to individual features is governed by Elastic user roles.
+Consult your administrator if you do not have the appropriate access.
+To learn more about roles, refer to <>.
+
+|===
+| Feature | Description | Available in
+
+| <>
+| Bulk assign asset criticality to multiple entities by importing a text file.
+| {sec-badge}
+
+| <>
+| Manage files that are stored in {kib}.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Create maps from your geographical data.
+| {sec-badge}
+
+| <>
+| Manage and download reports such as CSV files generated from saved searches.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Copy, edit, delete, import, and export your saved objects.
+These include dashboards, visualizations, maps, {data-sources}, and more.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Organize your project and objects into multiple spaces.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Create, manage, and assign tags to your saved objects.
+| {es-badge}{obs-badge}{sec-badge}
+
+| <>
+| Create and manage visualization panels that you can use across multiple dashboards.
+| {es-badge}{obs-badge}{sec-badge}
+|===
diff --git a/serverless/pages/project-settings.asciidoc b/serverless/pages/project-settings-data.asciidoc
similarity index 52%
rename from serverless/pages/project-settings.asciidoc
rename to serverless/pages/project-settings-data.asciidoc
index 9dc0f0c2..d0906f5b 100644
--- a/serverless/pages/project-settings.asciidoc
+++ b/serverless/pages/project-settings-data.asciidoc
@@ -1,11 +1,11 @@
-[[project-settings]]
-= Management settings
+[[project-setting-data]]
+= Manage project data
// :description: Manage your indices, data views, saved objects, settings, and more from a central location in Elastic.
// :keywords: serverless, management, overview
++++
-Management
+Data
++++
Go to **Project settings**, then ** Management** to manage your indices, data views, saved objects, settings, and more.
@@ -18,30 +18,18 @@ To learn more about roles, refer to <>.
|===
| Feature | Description | Available in
-| <>
-| Create and manage keys that can send requests on behalf of users.
-| {es-badge}{obs-badge}{sec-badge}
-
-| <>
-| Bulk assign asset criticality to multiple entities by importing a text file.
-| {sec-badge}
+| <>
+| Connect your data to your project.
+| {obs-badge}{sec-badge}
-| <>
-| Create and manage reusable connectors for triggering actions.
-| {es-badge}{sec-badge}
+| <>
+| Add monitoring for logs, metrics, and other types of data to a host.
+| {obs-badge}{sec-badge}
| <>
| Manage the fields in the data views that retrieve your data from {es-serverless}.
| {es-badge}{obs-badge}{sec-badge}
-| <>
-| Manage entity risk scoring, and preview risky entities.
-| {sec-badge}
-
-| <>
-| Manage files that are stored in {kib}.
-| {es-badge}{obs-badge}{sec-badge}
-
| <>
| View index settings, mappings, and statistics and perform operations on indices.
| {es-badge}{obs-badge}{sec-badge}
@@ -58,35 +46,6 @@ To learn more about roles, refer to <>.
| View, export, and import your {anomaly-detect} and {dfanalytics} jobs and trained models.
| {es-badge}{obs-badge}{sec-badge}
-| <>
-| Suppress rule notifications for scheduled periods of time.
-| {obs-badge}{sec-badge}
-
-| <>
-| Create maps from your geographical data.
-| {sec-badge}
-
-| <>
-| Manage and download reports such as CSV files generated from saved searches.
-| {es-badge}{obs-badge}{sec-badge}
-
-| <>
-| Create and manage rules that generate alerts.
-| {es-badge}
-
-| <>
-| Copy, edit, delete, import, and export your saved objects.
-These include dashboards, visualizations, maps, {data-sources}, and more.
-| {es-badge}{obs-badge}{sec-badge}
-
-| <>
-| Organize your project and objects into multiple spaces.
-| {es-badge}{obs-badge}{sec-badge}
-
-| <>
-| Create, manage, and assign tags to your saved objects.
-| {es-badge}{obs-badge}{sec-badge}
-
| <>
| Use transforms to pivot existing {es} indices into summarized or entity-centric indices.
| {es-badge}{obs-badge}{sec-badge}
diff --git a/serverless/pages/rules.asciidoc b/serverless/pages/rules.asciidoc
index 5c338953..c602c830 100644
--- a/serverless/pages/rules.asciidoc
+++ b/serverless/pages/rules.asciidoc
@@ -4,7 +4,7 @@
// :description: Alerting works by running checks on a schedule to detect conditions defined by a rule.
// :keywords: serverless, Elasticsearch, alerting, learn
-This content applies to: {es-badge}
+This content applies to: {es-badge} {sec-badge}
In general, a rule consists of three parts:
diff --git a/serverless/pages/sign-up.asciidoc b/serverless/pages/sign-up.asciidoc
index 9219c363..d4dfcad8 100644
--- a/serverless/pages/sign-up.asciidoc
+++ b/serverless/pages/sign-up.asciidoc
@@ -1,17 +1,13 @@
[[general-sign-up-trial]]
-= Get started with serverless
+= Sign up for Elastic Cloud
// :description: Information about signing up for a serverless Elastic Cloud trial
// :keywords: serverless, general, signup
-
-There are two options to create serverless projects:
-
-* If you are an existing customer, https://cloud.elastic.co/login[log in to Elastic Cloud]. On the home page, you will see a new option to create serverless projects. Note that if you are already subscribed to Elastic Cloud, there is no specific trial for serverless projects.
-* If you are a new user, you can https://cloud.elastic.co/serverless-registration[sign up for a free 14-day trial], and you will be able to launch a serverless project.
+The following page provides information on how to sign up for an Elastic Cloud Serverless account, for information on how to sign up for hosted deployments, see https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html[Elasticsearch Service - How do i sign up?].
[discrete]
[[general-sign-up-trial-what-is-included-in-my-trial]]
-== What is included in my trial?
+== Trial features
Your free 14-day trial includes:
@@ -20,6 +16,8 @@ Your free 14-day trial includes:
A deployment lets you explore Elastic solutions for Search, Observability, and Security. Trial deployments run on the latest version of the Elastic Stack. They includes 8 GB of RAM spread out over two availability zones, and enough storage space to get you started. If you’re looking to evaluate a smaller workload, you can scale down your trial deployment.
Each deployment includes Elastic features such as Maps, SIEM, machine learning, advanced security, and much more. You have some sample data sets to play with and tutorials that describe how to add your own data.
+To learn more about Elastic Cloud Hosted, check our https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html[Elasticsearch Service documentation].
+
**One serverless project**
Serverless projects package Elastic Stack features by type of solution:
@@ -37,7 +35,7 @@ During the trial period, you are limited to one active hosted deployment and one
[discrete]
[[general-sign-up-trial-what-limits-are-in-place-during-a-trial]]
-== What limits are in place during a trial?
+== Trial limitations
During the free 14 day trial, Elastic provides access to one hosted deployment and one serverless project. If all you want to do is try out Elastic, the trial includes more than enough to get you started. During the trial period, some limitations apply.
@@ -48,6 +46,8 @@ During the free 14 day trial, Elastic provides access to one hosted deployment a
* Machine learning nodes are available up to 4GB RAM
* Custom {es} plugins are not enabled
+To learn more about Elastic Cloud Hosted, check our https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html[Elasticsearch Service documentation].
+
**Serverless projects**
* You can have one active serverless project at a time.
@@ -55,9 +55,9 @@ During the free 14 day trial, Elastic provides access to one hosted deployment a
* Search Boost Window is limited to 7 days. This setting only exists in {es-serverless} projects
* Scaling is limited for serverless projects in trials. Failures might occur if the workload requires memory or compute beyond what the above search power and search boost window setting limits can provide.
-**How to remove restrictions?**
+**Remove limitations**
-To remove limitations, subscribe to https://www.elastic.co/guide/en/cloud/current/ec-billing-details.html[Elastic Cloud]. Elastic Cloud subscriptions include the following benefits:
+Subscribe to https://www.elastic.co/guide/en/cloud/current/ec-billing-details.html[Elastic Cloud] for the following benefits:
* Increased memory or storage for deployment components, such as {es} clusters, machine learning nodes, and APM server.
* As many deployments and projects as you need.
@@ -68,13 +68,13 @@ You can subscribe to Elastic Cloud at any time during your trial. <>.
[NOTE]
====
Serverless projects are only available for AWS Marketplace. Support for GCP Marketplace and Azure Marketplace will be added in the near future.
====
+[[general-user-profile]]
+== Update your user profile
+
+At any time, you can update your email address, change your password, or manage your multifactor authentication methods from your user profile.
+Check {cloud}/ec-account-user-settings.html[Edit user account settings] for more details.
+
[discrete]
[[general-sign-up-trial-how-do-i-get-help]]
-== How do I get help?
+== Get help and support
We’re here to help. If you have any questions, reach out to https://cloud.elastic.co/support[Support].
+
+
diff --git a/serverless/pages/technical-preview-limitations.asciidoc b/serverless/pages/technical-preview-limitations.asciidoc
deleted file mode 100644
index 830ff882..00000000
--- a/serverless/pages/technical-preview-limitations.asciidoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[[elasticsearch-technical-preview-limitations]]
-= Limitations
-
-// :description: Review the limitations that apply to {es-serverless} projects.
-// :keywords: serverless, elasticsearch
-
-
-// This page is not included in the index file, so it is not visible in the navigation menu anymore. HTTP redirects will be set up.
-
-Refer to <> for a comparison of {es-serverless} with other Elastic Cloud offerings.
\ No newline at end of file
diff --git a/serverless/pages/user-profile.asciidoc b/serverless/pages/user-profile.asciidoc
deleted file mode 100644
index fb8d8b39..00000000
--- a/serverless/pages/user-profile.asciidoc
+++ /dev/null
@@ -1,54 +0,0 @@
-[[general-user-profile]]
-= Update your user profile
-
-// :description: Manage your profile settings.
-// :keywords: serverless, general, profile, update
-
-To edit your user profile, go to the user icon on the header bar and select **Profile**.
-
-[discrete]
-[[general-user-profile-update-your-email-address]]
-== Update your email address
-
-Your email address is used to sign in. If needed, you can change this email address.
-
-. In the **Profile** section, by **Email address**, select **Edit**.
-. Enter a new email address and your current password.
-+
-An email is sent to the new address with a link to confirm the change. If you don't get the email after a few minutes, check your spam folder.
-
-[discrete]
-[[general-user-profile-change-your-password]]
-== Change your password
-
-When you signed up with your email address, you selected a password that you use to log in to the Elastic Cloud console. If needed, you can change this password.
-
-If you know your current password:
-
-. Navigate to the **Password** section and select **Change password**.
-. Enter the current password and provide the new password that you want to use.
-
-If you don't know your current password:
-
-. At the login screen for the Elastic Cloud console, select the link **Forgot password?**
-. Enter the email address for your account and select **Reset password**.
-+
-An email is sent to the address you specified with a link to reset the password. If you don't get the email after a few minutes, check your spam folder.
-
-[discrete]
-[[general-user-profile-enable-multi-factor-authentication]]
-== Enable multi-factor authentication
-
-To add an extra layer of security, you can either set up Google authenticator or text messaging on a mobile device.
-
-[TIP]
-====
-Before you start using multi-factor authentication, verify that your device has SMS capabilities or download the Google Authenticator application onto your device.
-====
-
-To enable multi-factor authentication, you must enroll your device.
-
-. Navigate to the **Multi-factor authentication** section.
-. Select **Configure** to enable the Authenticator app or **Add a phone number** to enable the Text message.
-
-If the device you want to remove is your only enrolled device, you must disable multi-factor authentication first. If your device is lost or stolen, contact https://support.elastic.co/[support].
diff --git a/serverless/pages/visualize-library.asciidoc b/serverless/pages/visualize-library.asciidoc
new file mode 100644
index 00000000..05510a2c
--- /dev/null
+++ b/serverless/pages/visualize-library.asciidoc
@@ -0,0 +1,28 @@
+[[visualize-library]]
+= Visualize Library
+
+// :keywords: serverless, Elasticsearch, Observability, Security
+
+////
+/* TODO: Figure out best way to deal with inconsistent location of these capabilities in different solutions.
+This content has been removed from the navigation for now because it's not useful in its current state.*/
+////
+
+This content applies to: {es-badge} {obs-badge} {sec-badge}
+
+The **Visualize Library** is a space where you can save visualization panels that you may want to use across multiple dashboards. The **Visualize Library** consists of two pages:
+
+* **Visualizations**
+* **Annotation groups**
+
+[discrete]
+[[visualize-library-visualizations]]
+== Visualizations
+
+By default the **Visualizations** page opens first. Here you can create new visualizations, or select from a list of previously created visualizations. To learn more, refer to <>.
+
+[discrete]
+[[visualize-library-annotation-groups]]
+== Annotation groups
+
+**Annotation groups** give you the option to mark points on a visualization panel with events, such as a deployment, to help track performance. These annotations can be reused across multiple visualization panels.
\ No newline at end of file
diff --git a/serverless/pages/welcome-to-serverless.asciidoc b/serverless/pages/welcome-to-serverless.asciidoc
index a61f7641..7a49670c 100644
--- a/serverless/pages/welcome-to-serverless.asciidoc
+++ b/serverless/pages/welcome-to-serverless.asciidoc
@@ -1,71 +1,127 @@
-++++
-
-++++
-
-{serverless-full} products allow you to deploy and use Elastic for your use cases without managing the underlying Elastic cluster,
-such as nodes, data tiers, and scaling. Serverless instances are fully-managed, autoscaled, and automatically upgraded by Elastic so you can
-focus more on gaining value and insight from your data.
+{serverless-full} is a fully managed solution that allows you to deploy and use Elastic for your use cases without managing the underlying infrastructure. It represents a shift in how you interact with {es} - instead of managing clusters, nodes, data tiers, and scaling, you create **serverless projects** that are fully managed and automatically scaled by Elastic. This abstraction of infrastructure decisions allows you to focus solely on gaining value and insight from your data.
+
+{serverless-full} automatically provisions, manages, and scales your {es} resources based on your actual usage. Unlike traditional deployments where you need to predict and provision resources in advance, serverless adapts to your workload in real-time, ensuring optimal performance while eliminating the need for manual capacity planning.
+
+Serverless projects use the core components of the {stack}, such as {es} and {kib}, and are based on an architecture that
+decouples compute and storage. Search and indexing operations are separated, which offers high flexibility for scaling your workloads while ensuring
+a high level of performance.
Elastic provides three serverless solutions available on {ecloud}:
-* **{es-serverless}**: Build powerful applications and search experiences using a rich ecosystem of vector search capabilities, APIs, and libraries.
-* **{obs-serverless}**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
-* **{sec-serverless}**: Detect, investigate, and respond to threats, with SIEM, endpoint protection, and AI-powered analytics capabilities.
+* **https://www.elastic.co/guide/en/serverless/current/what-is-elasticsearch-serverless.html[{es-serverless}]**: Build powerful applications and search experiences using a rich ecosystem of vector search capabilities, APIs, and libraries.
+* **https://www.elastic.co/guide/en/serverless/current/what-is-observability-serverless.html[{obs-serverless}]**: Monitor your own platforms and services using powerful machine learning and analytics tools with your logs, metrics, traces, and APM data.
+* **https://www.elastic.co/guide/en/serverless/current/what-is-security-serverless.html[{sec-serverless}]**: Detect, investigate, and respond to threats with SIEM, endpoint protection, and AI-powered analytics capabilities.
-Serverless instances of the Elastic Stack that you create in {ecloud} are called **serverless projects**.
+// https://www.elastic.co/blog/elastic-serverless-architecture[Learn more about serverless in our blog].
[discrete]
-== Get started
+== Benefits of serverless projects
-Choose the type of project that matches your needs and we’ll help you get started with our solution guides.
+**Management free.** Elastic manages the underlying Elastic cluster, so you can focus on your data. With serverless projects, Elastic is responsible for automatic upgrades, data backups,
+and business continuity.
-[cols="1,1"]
-|===
-|
-|
+**Autoscaled.** To meet your performance requirements, the system automatically adjusts to your workloads. For example, when you have a short time spike on the
+data you ingest, more resources are allocated for that period of time. When the spike is over, the system uses less resources, without any action
+on your end.
-| image:https://www.elastic.co/docs/assets/images/elasticsearch.png[width=150]
-a| [.card-title]#{es}# +
-Build custom search applications with {es}.
+**Optimized data storage.** Your data is stored in cost-efficient, general storage. A cache layer is available on top of the general storage for recent and frequently queried data that provides faster search speed.
+The size of the cache layer and the volume of data it holds depend on <> that you can configure for each project.
-<>
+**Dedicated experiences.** All serverless solutions are built on the Elastic Search Platform and include the core capabilities of the Elastic Stack. They also each offer a distinct experience and specific capabilities that help you focus on your data, goals, and use cases.
-| image:https://www.elastic.co/docs/assets/images/observability.png[width=150]
-a| [.card-title]#Observability# +
-Monitor applications and systems with Elastic Observability.
+**Pay per usage.** Each serverless project type includes product-specific and usage-based pricing.
-<>
+**Data and performance control**. Control your project data and query performance against your project data.
+* Data. Choose the data you want to ingest and the method to ingest it. By default, data is stored indefinitely in your project,
+and you define the retention settings for your data streams.
+* Performance. For granular control over costs and query performance against your project data, serverless projects come with
+a set of predefined settings you can edit.
-| image:https://www.elastic.co/docs/assets/images/security.png[width=150]
-a| [.card-title]#Security# +
-Detect, investigate, and respond to threats with Elastic Security.
+[discrete]
+[[general-what-is-serverless-elastic-differences-between-serverless-projects-and-hosted-deployments-on-ecloud]]
+== Differences between serverless projects and hosted deployments on {ecloud}
-<>
+You can run https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html[hosted deployments] of the {stack} on {ecloud}. These hosted deployments provide more provisioning and advanced configuration options.
-|
-|
+|===
+| Option| Serverless| Hosted
+| **Cluster management**
+| Fully managed by Elastic.
+| You provision and manage your hosted clusters. Shared responsibility with Elastic.
+| **Cluster management**
+| Fully managed by Elastic.
+| You provision and manage your hosted clusters. Shared responsibility with Elastic.
+| **Scaling**
+| Autoscales out of the box.
+| Manual scaling or autoscaling available for you to enable.
+
+| **Upgrades**
+| Automatically performed by Elastic.
+| You choose when to upgrade.
+
+| **Pricing**
+| Individual per project type and based on your usage.
+| Based on deployment size and subscription level.
+
+| **Performance**
+| Autoscales based on your usage.
+| Manual scaling.
+
+| **Solutions**
+| Single solution per project.
+| Full Elastic Stack per deployment.
+
+| **User management**
+| Elastic Cloud-managed users.
+| Elastic Cloud-managed users and native Kibana users.
+
+| **API support**
+| Subset of https://www.elastic.co/docs/api[APIs].
+| All Elastic APIs.
+
+| **Backups**
+| Projects automatically backed up by Elastic.
+| Your responsibility with Snapshot & Restore.
+
+| **Data retention**
+| Editable on data streams.
+| Index Lifecycle Management.
|===
[discrete]
-== Featured topics
-
-* <>:
-Invite new members to your organization.
-* <>:
-Assign user roles and privileges to members in your organization.
-* <>:
-Manage your project data, search power, and more.
-* <>:
-View the details about your subscription.
-* <>:
-Check past and current usage for your projects.
-* <>:
-Manage your indices, data views, and more.
+[[general-what-is-serverless-elastic-answers-to-common-serverless-questions]]
+== Answers to common serverless questions
+
+**Is there migration support between hosted deployments and serverless projects?**
+
+Migration paths between hosted deployments and serverless projects are currently unsupported.
+
+**How can I move data to or from serverless projects?**
+
+We are working on data migration tools! In the interim, <> with Elasticsearch input and output plugins to move data to and from serverless projects.
+
+**How does serverless ensure compatibility between software versions?**
+
+Connections and configurations are unaffected by upgrades. To ensure compatibility between software versions, quality testing and API versioning are used.
+
+**Can I convert a serverless project into a hosted deployment, or a hosted deployment into a serverless project?**
+
+Projects and deployments are based on different architectures, and you are unable to convert.
+
+**Can I convert a serverless project into a project of a different type?**
+
+You are unable to convert projects into different project types, but you can create as many projects as you’d like. You will be charged only for your usage.
+
+**How can I create serverless service accounts?**
+
+Create API keys for service accounts in your serverless projects. Options to automate the creation of API keys with tools such as Terraform will be available in the future.
+
+To raise a Support case with Elastic, raise a case for your subscription the same way you do today. In the body of the case, make sure to mention you are working in serverless to ensure we can provide the appropriate support.
+
+**Where can I learn about pricing for serverless?**
+
+See serverless pricing information for https://www.elastic.co/pricing/serverless-search[Search], https://www.elastic.co/pricing/serverless-observability[Observability], and https://www.elastic.co/pricing/serverless-security[Security].
+
+**Can I request backups or restores for my projects?**
+
+It is not currently possible to request backups or restores for projects, but we are working on data migration tools to better support this.
diff --git a/serverless/pages/what-is-elasticsearch-serverless.asciidoc b/serverless/pages/what-is-elasticsearch-serverless.asciidoc
index 6ec4e7ac..9ea48f92 100644
--- a/serverless/pages/what-is-elasticsearch-serverless.asciidoc
+++ b/serverless/pages/what-is-elasticsearch-serverless.asciidoc
@@ -4,7 +4,7 @@
// :description: Build search solutions and applications with {es-serverless}.
// :keywords: serverless, elasticsearch, overview
-{es} is an open source distributed search and analytics engine, scalable data store, and vector database. It’s optimized for speed and relevance on production-scale workloads.
+{es} is an open source distributed search and analytics engine, scalable data store, and vector database. It's optimized for speed and relevance on production-scale workloads.
.Understanding Elasticsearch on serverless
[IMPORTANT]
diff --git a/serverless/pages/what-is-serverless.asciidoc b/serverless/pages/what-is-serverless.asciidoc
deleted file mode 100644
index f3ca1143..00000000
--- a/serverless/pages/what-is-serverless.asciidoc
+++ /dev/null
@@ -1,127 +0,0 @@
-[[general-what-is-serverless-elastic]]
-= What is serverless Elastic?
-
-// :keywords: serverless
-
-Serverless projects use the core components of the {stack}, such as {es} and {kib}, and are based on an architecture that
-decouples compute and storage. Search and indexing operations are separated, which offers high flexibility for scaling your workloads while ensuring
-a high level of performance.
-
-**Management free.** Elastic manages the underlying Elastic cluster, so you can focus on your data. With serverless projects, Elastic is responsible for automatic upgrades, data backups,
-and business continuity.
-
-**Autoscaled.** To meet your performance requirements, the system automatically adjusts to your workloads. For example, when you have a short time spike on the
-data you ingest, more resources are allocated for that period of time. When the spike is over, the system uses less resources, without any action
-on your end.
-
-**Optimized data storage.** Your data is stored in cost-efficient, general storage. A cache layer is available on top of the general storage for recent and frequently queried data that provides faster search speed.
-The size of the cache layer and the volume of data it holds depend on <> that you can configure for each project.
-
-**Dedicated experiences.** All serverless solutions are built on the Elastic Search Platform and include the core capabilities of the Elastic Stack. They also each offer a distinct experience and specific capabilities that help you focus on your data, goals, and use cases.
-
-**Pay per usage.** Each serverless project type includes product-specific and usage-based pricing.
-
-[discrete]
-[[general-what-is-serverless-elastic-control-your-data-and-performance]]
-== Control your data and performance
-
-Control your project data and query performance against your project data.
-
-**Data.** Choose the data you want to ingest, and the method to ingest it. By default, data is stored indefinitely in your project,
-and you define the retention settings for your data streams.
-
-**Performance.** For granular control over costs and query performance against your project data, serverless projects come with a set of predefined <> that you can edit.
-
-.Some or all of these settings may not be available for all types of serverless projects.
-[NOTE]
-====
-
-====
-
-[discrete]
-[[general-what-is-serverless-elastic-differences-between-serverless-projects-and-hosted-deployments-on-ecloud]]
-== Differences between serverless projects and hosted deployments on {ecloud}
-
-You can run https://www.elastic.co/guide/en/cloud/current/ec-getting-started.html[hosted deployments] of the {stack} on {ecloud}. These hosted deployments provide more provisioning and advanced configuration options.
-
-|===
-| Option| Serverless| Hosted
-
-| **Cluster management**
-| Fully managed by Elastic.
-| You provision and manage your hosted clusters. Shared responsibility with Elastic.
-
-| **Scaling**
-| Autoscales out of the box.
-| Manual scaling or autoscaling available for you to enable.
-
-| **Upgrades**
-| Automatically performed by Elastic.
-| You choose when to upgrade.
-
-| **Pricing**
-| Individual per project type and based on your usage.
-| Based on deployment size and subscription level.
-
-| **Performance**
-| Autoscales based on your usage.
-| Manual scaling.
-
-| **Solutions**
-| Single solution per project.
-| Full Elastic Stack per deployment.
-
-| **User management**
-| Elastic Cloud-managed users.
-| Elastic Cloud-managed users and native Kibana users.
-
-| **API support**
-| Subset of https://www.elastic.co/docs/api[APIs].
-| All Elastic APIs.
-
-| **Backups**
-| Projects automatically backed up by Elastic.
-| Your responsibility with Snapshot & Restore.
-
-| **Data retention**
-| Editable on data streams.
-| Index Lifecycle Management.
-|===
-
-[discrete]
-[[general-what-is-serverless-elastic-answers-to-common-serverless-questions]]
-== Answers to common serverless questions
-
-**Is there migration support between hosted deployments and serverless projects?**
-
-Migration paths between hosted deployments and serverless projects are currently unsupported.
-
-**How can I move data to or from serverless projects?**
-
-We are working on data migration tools! In the interim, you can <> with {es} input and output plugins to move data to and from serverless projects.
-
-**How does serverless ensure compatibility between software versions?**
-
-Connections and configurations are unaffected by upgrades. To ensure compatibility between software versions, quality testing and API versioning are used.
-
-**Can I convert a serverless project into a hosted deployment, or a hosted deployment into a serverless project?**
-
-Projects and deployments are based on different architectures, and you are unable to convert.
-
-**Can I convert a serverless project into a project of a different type?**
-
-You are unable to convert projects into different project types, but you can create as many projects as you'd like. You will be charged only for your usage.
-
-**How can I create serverless service accounts?**
-
-Create API keys for service accounts in your serverless projects. Options to automate the creation of API keys with tools such as Terraform will be available in the future.
-
-To raise a Support case with Elastic, raise a case for your subscription the same way you do today. In the body of the case, make sure to mention you are working in serverless to ensure we can provide the appropriate support.
-
-**Where can I learn about pricing for serverless?**
-
-See serverless pricing information for https://www.elastic.co/pricing/serverless-search[Search], https://www.elastic.co/pricing/serverless-observability[Observability], and https://www.elastic.co/pricing/serverless-security[Security].
-
-**Can I request backups or restores for my projects?**
-
-It is not currently possible to request backups or restores for projects, but we are working on data migration tools to better support this.