diff --git a/source/guides/setup-onboard-manage-comply.rst b/source/guides/setup-onboard-manage-comply.rst
index ad635acface..a32dbf5d04e 100644
--- a/source/guides/setup-onboard-manage-comply.rst
+++ b/source/guides/setup-onboard-manage-comply.rst
@@ -98,7 +98,6 @@ All Mattermost Instances
    :glob:
 
    /manage/generating-support-packet.rst
-   /manage/team-channel-members.rst
    /manage/mmctl-command-line-tool.rst
    /manage/user-satisfaction-surveys.rst
 
@@ -109,6 +108,7 @@ Self-Managed Deployments
    :maxdepth: 1
    :glob:
  
+   /manage/team-channel-members.rst
    /manage/command-line-tools.rst
    /manage/scripts.rst
    /manage/statistics.rst
@@ -124,6 +124,7 @@ Cloud Workspaces
    :maxdepth: 1
    :glob:
  
+   /manage/cloud-team-channel.rst
    /manage/cloud-billing.rst
    /manage/cloud-reporting.rst
 
@@ -154,4 +155,4 @@ Cloud Workspaces
    /comply/cloud-compliance-and-oversight.rst
    /comply/cloud-compliance-export.rst
    /comply/cloud-data-retention-policy.rst
-   /comply/cloud-custom-terms-of-service.rst
\ No newline at end of file
+   /comply/cloud-custom-terms-of-service.rst
diff --git a/source/manage/cloud-team-and-channel.rst b/source/manage/cloud-team-and-channel.rst
index bac61fff318..02717bc8391 100644
--- a/source/manage/cloud-team-and-channel.rst
+++ b/source/manage/cloud-team-and-channel.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 Managing Team and Channel Members
 =================================
 
@@ -23,6 +21,22 @@ Team Profile
 
 The name and description of the team.
 
+System Admins can archive or unarchive the team from within **User Management > Teams > Team Management**. Archiving a team makes its contents inaccessible for all users. All related information is archived, including posts from the database. Before archiving a team, we recommend that you perform a database backup.
+
+Archiving a Team
+^^^^^^^^^^^^^^^^
+
+Select **Archive Team**, then select **Save**. Select **Archive** when prompted to confirm the team archive.
+
+Alternatively, System Admins can use the mmctl ``mmctl team archive`` to archive teams. See the `mmctl product documentation <https://docs.mattermost.com/manage/mmctl-command-line-tool.html#mmctl-team-archive>`__ for details.
+
+Unarchiving a Team
+^^^^^^^^^^^^^^^^^^
+
+Select **Unarchive Team**, then select **Save**.
+
+Alternatively, System Admins can use the mmctl ``mmctl team restore`` to unarchive teams. See the `mmctl product documentation <https://docs.mattermost.com/manage/mmctl-command-line-tool.html#mmctl-team-restore>`__ for details.
+
 Team Management
 ~~~~~~~~~~~~~~~
 
diff --git a/source/manage/team-channel-members.rst b/source/manage/team-channel-members.rst
index 2f8c668c2cf..38d13cebf66 100644
--- a/source/manage/team-channel-members.rst
+++ b/source/manage/team-channel-members.rst
@@ -19,7 +19,23 @@ Select a team to view its configuration options.
 Team Profile
 ~~~~~~~~~~~~
 
-The name and description of the team.
+The name and description of the team. 
+
+System Admins can archive or unarchive the team from within **User Management > Teams > Team Management**. Archiving a team makes its contents inaccessible for all users. All related information is archived, including posts from the database. Before archiving a team, we recommend that you perform a database backup.
+
+Archiving a Team
+^^^^^^^^^^^^^^^^
+
+Select **Archive Team**, then select **Save**. Select **Archive** when prompted to confirm the team archive.
+
+Alternatively, System Admins can use the mmctl ``mmctl team archive`` to archive teams. See the `mmctl product documentation <https://docs.mattermost.com/manage/mmctl-command-line-tool.html#mmctl-team-archive>`__ for details.
+
+Unarchiving a Team
+^^^^^^^^^^^^^^^^^^
+
+Select **Unarchive Team**, then select **Save**.
+
+Alternatively, System Admins can use the mmctl ``mmctl team restore`` to archive teams. See the `mmctl product documentation <https://docs.mattermost.com/manage/mmctl-command-line-tool.html#mmctl-team-restore>`__ for details.
 
 Team Management
 ~~~~~~~~~~~~~~~