diff --git a/docs/images/add_shared_file_storage.png b/docs/images/add_shared_file_storage.png
new file mode 100644
index 000000000..f168f1cf6
Binary files /dev/null and b/docs/images/add_shared_file_storage.png differ
diff --git a/docs/images/add_shared_secret.png b/docs/images/add_shared_secret.png
new file mode 100644
index 000000000..c36eac6bc
Binary files /dev/null and b/docs/images/add_shared_secret.png differ
diff --git a/docs/images/add_shared_secret_from_notebook.png b/docs/images/add_shared_secret_from_notebook.png
new file mode 100644
index 000000000..02c60b28e
Binary files /dev/null and b/docs/images/add_shared_secret_from_notebook.png differ
diff --git a/docs/teams/intro_to_teams.md b/docs/teams/intro_to_teams.md
new file mode 100644
index 000000000..388a7b96f
--- /dev/null
+++ b/docs/teams/intro_to_teams.md
@@ -0,0 +1,11 @@
+# Intro to Livebook Teams
+
+[Livebook Teams](https://livebook.dev/teams/?ref=docs) is a product that amplifies Livebook with features designed for teams and businesses.
+
+It's currently in free beta. You can [join the beta waiting list here](https://livebook.dev/teams/?ref=docs) to get early access.
+
+## Current features in the beta
+
+- [Shared secrets management](shared_secrets.md)
+- [Shared file storages](shared_file_storages.md)
+- [Airgapped notebook deployment with Zero Trust Authentication](../deployment/docker.md#deploy-notebooks-as-applications)
\ No newline at end of file
diff --git a/docs/teams/shared_file_storages.md b/docs/teams/shared_file_storages.md
new file mode 100644
index 000000000..7cd0c97e6
--- /dev/null
+++ b/docs/teams/shared_file_storages.md
@@ -0,0 +1,25 @@
+# Shared file storages
+
+## Overview
+
+This feature allows your team to share the configuration of S3-compatible storages.
+
+Livebook file storages are used to store notebooks and their files.
+
+Whenever you add (update or detach) a file storage to your organization hub, Livebook Teams will synchronize that with the Livebook of every member of your organization.
+
+
+
+## How it works
+
+Here's a video showing how that feature works.
+
+
+
+## Security strengths
+
+Livebook Teams cannot access the credentials of your S3 (compatible) account.
+
+Livebook encrypts your S3 credentials locally in your machine using your Teams key. Then, they're sent encrypted to Livebook Teams servers.
+
+When a new synchronization is needed, Livebook Teams sends the encrypted credentials to the Livebook of team members, and their Livebook decrypts that in their local machines using the same Teams key.
diff --git a/docs/teams/shared_secrets.md b/docs/teams/shared_secrets.md
new file mode 100644
index 000000000..d853730e8
--- /dev/null
+++ b/docs/teams/shared_secrets.md
@@ -0,0 +1,29 @@
+# Shared secrets management
+
+## Overview
+
+This feature allows your team to share Livebook secrets among team members in an easy way.
+
+Just add a secret to your organization hub, and Livebook Teams will synchronize it with the Livebook of every member of your organization.
+
+
+
+You can also create such secrets directly from a notebook.
+
+
+
+Shared secrets updates and deletions will also be synchronized.
+
+## How it works
+
+Here's a video showing how that feature works.
+
+
+
+## Security strengths
+
+Livebook Teams cannot access the plain text version of your organization's secrets.
+
+Livebook encrypts your secrets locally in your machine using your Teams key. Then, the secret is sent encrypted to Livebook Teams servers.
+
+When a new synchronization is needed, Livebook Teams sends the encrypted secret to the Livebook of team members, and their Livebook decrypts the secret in their local machines using the same Teams key.
diff --git a/mix.exs b/mix.exs
index 1e1a1d364..7f606e3de 100644
--- a/mix.exs
+++ b/mix.exs
@@ -194,7 +194,9 @@ defmodule Livebook.MixProject do
extra_section: "Guides",
extras: extras(),
filter_modules: fn mod, _ -> mod in [Livebook] end,
+ assets: Path.expand("./docs/images"),
groups_for_extras: [
+ "Livebook Teams": Path.wildcard("docs/teams/*"),
Deployment: Path.wildcard("docs/deployment/*")
]
]
@@ -207,7 +209,10 @@ defmodule Livebook.MixProject do
"docs/deployment/docker.md",
"docs/deployment/cloudflare.md",
"docs/deployment/google_iap.md",
- "docs/deployment/tailscale.md"
+ "docs/deployment/tailscale.md",
+ "docs/teams/intro_to_teams.md",
+ "docs/teams/shared_secrets.md",
+ "docs/teams/shared_file_storages.md"
]
end
end