diff --git a/Web/Controls/Help/Installation/DocSpaceCommunity.ascx b/Web/Controls/Help/Installation/DocSpaceCommunity.ascx
index 84f67eff0..56a025155 100644
--- a/Web/Controls/Help/Installation/DocSpaceCommunity.ascx
+++ b/Web/Controls/Help/Installation/DocSpaceCommunity.ascx
@@ -25,6 +25,12 @@
     
         <ul>    
             <li><h6><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-changelog.aspx")%>">Changelog</a></h6></li>        
+            <li><h6>General configuration</h6>
+                <ul>
+                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-services.aspx")%>">DocSpace services</a></li>
+                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-tables.aspx")%>">DocSpace SQL tables</a></li>
+                </ul>
+            </li>
             <li><h6>Installing</h6>
                 <ul>
                     <li>1-click install for Docker and Linux
diff --git a/Web/Controls/Help/Installation/DocSpaceInstallation.ascx b/Web/Controls/Help/Installation/DocSpaceInstallation.ascx
index 8fd249d09..ee261fd02 100644
--- a/Web/Controls/Help/Installation/DocSpaceInstallation.ascx
+++ b/Web/Controls/Help/Installation/DocSpaceInstallation.ascx
@@ -25,6 +25,13 @@
     <h2><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-community-index.aspx")%>">ONLYOFFICE DocSpace Community</a></h2>
         <ul> 
             <li><h6><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-changelog.aspx")%>">Changelog</a></h6></li>           
+            <li><h6>General configuration</h6>
+                <ul>
+                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-services.aspx")%>">DocSpace services</a></li>
+                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-tables.aspx")%>">DocSpace SQL tables</a></li>
+                </ul>
+                </ul>
+            </li>
             <li><h6>Installing</h6>
                 <ul>
                     <li>1-click install for Docker and Linux
diff --git a/Web/Controls/Help/Installation/WorkspaceCommunity.ascx b/Web/Controls/Help/Installation/WorkspaceCommunity.ascx
index cecaf2548..599f378f4 100644
--- a/Web/Controls/Help/Installation/WorkspaceCommunity.ascx
+++ b/Web/Controls/Help/Installation/WorkspaceCommunity.ascx
@@ -45,12 +45,6 @@
     
         <ul>
             <li><h6><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-changelog.aspx")%>">Changelog</a></h6></li>
-            <li><h6>General configuration</h6>
-                <ul>
-                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-services.aspx")%>">Workspace services</a></li>
-                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-tables.aspx")%>">Workspace SQL tables</a></li>
-                </ul>
-            </li>
             <li><h6>System requirements</h6>
                 <ul>
                     <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-sys-reqs-docker.aspx")%>">Docker version</a></li>
diff --git a/Web/Controls/Help/Installation/WorkspaceInstallation.ascx b/Web/Controls/Help/Installation/WorkspaceInstallation.ascx
index 12eb8d0d8..a2037a55f 100644
--- a/Web/Controls/Help/Installation/WorkspaceInstallation.ascx
+++ b/Web/Controls/Help/Installation/WorkspaceInstallation.ascx
@@ -49,13 +49,6 @@
     <h2><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-community-index.aspx")%>">ONLYOFFICE Workspace</a></h2>
         <ul>
             <li><h6><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-changelog.aspx")%>">Changelog</a></h6></li>
-            <li><h6>General configuration</h6>
-                <ul>
-                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-services.aspx")%>">Workspace services</a></li>
-                    <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-tables.aspx")%>">Workspace SQL tables</a></li>
-                </ul>
-                </ul>
-            </li>
             <li><h6>System requirements</h6>
                 <ul>
                     <li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-sys-reqs-docker.aspx")%>">Docker version</a></li>
diff --git a/Web/Controls/Help/Server/Docker/Opensource/Services/WorkspaceServices.ascx b/Web/Controls/Help/Server/DocSpace/Services/DocSpaceServices.ascx
similarity index 89%
rename from Web/Controls/Help/Server/Docker/Opensource/Services/WorkspaceServices.ascx
rename to Web/Controls/Help/Server/DocSpace/Services/DocSpaceServices.ascx
index 386957ba4..5b8773d29 100644
--- a/Web/Controls/Help/Server/Docker/Opensource/Services/WorkspaceServices.ascx
+++ b/Web/Controls/Help/Server/DocSpace/Services/DocSpaceServices.ascx
@@ -4,29 +4,21 @@
 <script runat="server">
     protected override void Init()
     {
-        PageTitle = PageCaption = "Workspace services";
+        PageTitle = PageCaption = "DocSpace services";
         MetaKeyWords = "";
-        MetaDescription = "Workspace services.";
+        MetaDescription = "DocSpace services.";
     }
 </script>
 
 <div id="toggleMenuEditors" class="MainHelpCenter">
-    <h1 class="subHeaderFeaturesCaption Guides_Video_Captions">Workspace services</h1>
-    <span>
-         <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/Versions/CommunityEdition/CommunityEdition_Current.ascx" />
-    </span>
-    <div class="keyword_block">
-        <ul>
-            <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Tags/server-version/server-version.ascx" /></li>
-        </ul>
-    </div>
+    <h1 class="subHeaderFeaturesCaption Guides_Video_Captions">DocSpace services</h1>
     <div class="video_ground video_trips">
         <h2 id="introduction">Introduction</h2>
         <div class="block_of_step">
             <div class="screen_text">
-                <p>Service is the ONLYOFFICE Workspace component that is used to perform long-running background operations without user interaction.
+                <p>Service is the ONLYOFFICE DocSpace component that is used to perform long-running background operations without user interaction.
                     The service can be started and stopped from any application component or other services.</p>
-                <p>Below you can find a list of the ONLYOFFICE Workspace services.</p>
+                <p>Below you can find a list of the ONLYOFFICE DocSpace services.</p>
                 <table class="table_portslist script_parameters">
                     <colgroup>
                         <col style="width: 250px;" />
@@ -56,8 +48,8 @@
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="ClearEvents">ClearEvents</div></td>
-                            <td>Clears the <a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-tables.aspx")%>#login_events">login_events</a>
-                            and <a href="<%=VirtualPathUtility.ToAbsolute("~/installation/workspace-general-config-tables.aspx")%>#audit_events">audit_events</a> tables
+                            <td>Clears the <a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-tables.aspx")%>#login_events">login_events</a>
+                            and <a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docspace-general-config-tables.aspx")%>#audit_events">audit_events</a> tables
                             by <b>LoginHistoryLifeTime</b> and <b>AuditTrailLifeTime</b> to log out users after the timeout.</td>
                         </tr>
                         <tr>
@@ -92,7 +84,7 @@
                         <tr>
                             <td><div class="copy-link" id="NotifyService">NotifyService</div></td>
                             <td>
-                                <p>Launches the additional services related to the notifications about Workspace events:</p>
+                                <p>Launches the additional services related to the notifications about DocSpace events:</p>
                                 <ul>
                                     <li><b>NotifySenderService</b> - sends messages from the database;</li>
                                     <li><b>NotifyCleanerService</b> - removes messages.</li>
@@ -119,7 +111,7 @@
                         <tr>
                             <td><div class="copy-link" id="SsoAuth">SsoAuth</div></td>
                             <td>Allows you to enable and configure the SAML-based single sign-on (SSO) authentication
-                                providing a faster, easier, and more secure way for users to access Workspace. The port number is 9834.</td>
+                                providing a faster, easier, and more secure way for users to access DocSpace. The port number is 9834.</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="StudioNotifyService">StudioNotifyService</div></td>
diff --git a/Web/Controls/Help/Server/Docker/Opensource/Tables/WorkspaceTables.ascx b/Web/Controls/Help/Server/DocSpace/Tables/DocSpaceTables.ascx
similarity index 89%
rename from Web/Controls/Help/Server/Docker/Opensource/Tables/WorkspaceTables.ascx
rename to Web/Controls/Help/Server/DocSpace/Tables/DocSpaceTables.ascx
index 7e89238e3..85c507bb2 100644
--- a/Web/Controls/Help/Server/Docker/Opensource/Tables/WorkspaceTables.ascx
+++ b/Web/Controls/Help/Server/DocSpace/Tables/DocSpaceTables.ascx
@@ -4,29 +4,20 @@
 <script runat="server">
     protected override void Init()
     {
-        PageTitle = PageCaption = "Workspace SQL tables";
+        PageTitle = PageCaption = "DocSpace SQL tables";
         MetaKeyWords = "";
-        MetaDescription = "Workspace SQL tables.";
+        MetaDescription = "DocSpace SQL tables.";
     }
 </script>
 
 <div id="toggleMenuEditors" class="MainHelpCenter">
-    <h1 class="subHeaderFeaturesCaption Guides_Video_Captions">Workspace SQL tables</h1>
-    <span>
-         <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/Versions/CommunityEdition/CommunityEdition_Current.ascx" />
-    </span>
-    <div class="keyword_block">
-        <ul>
-            <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Tags/server-version/server-version.ascx" /></li>
-        </ul>
-    </div>
+    <h1 class="subHeaderFeaturesCaption Guides_Video_Captions">DocSpace SQL tables</h1>
     <div class="video_ground video_trips">
         <h2 id="introduction">Introduction</h2>
         <div class="block_of_step">
             <div class="screen_text">
-                <p>All necessary information for the ONLYOFFICE Workspace database is stored in tables.</p>
-                <p>Below you can find a list of the main ONLYOFFICE Workspace tables.
-                    All the SQL tables can be found <a target="_blank" href="https://github.com/ONLYOFFICE/CommunityServer/blob/master/build/sql/onlyoffice.sql">here</a>.</p>
+                <p>All necessary information for the ONLYOFFICE DocSpace database is stored in tables.</p>
+                <p>Below you can find a list of the main ONLYOFFICE DocSpace tables.</p>
                 <table class="table_portslist script_parameters">
                     <colgroup>
                         <col style="width: 250px;" />
@@ -57,7 +48,7 @@
                         <tr>
                             <td><div class="copy-link" id="backup_schedule">backup_schedule</div></td>
                             <td>Backup schedule.</td>
-                            <td>tenant_id, backup_mail, cron, backups_stored, storage_type, storage_base_path, last_backup_time, storage_params</td>
+                            <td>tenant_id, cron, backups_stored, storage_type, storage_base_path, last_backup_time, storage_params</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="core_acl">core_acl</div></td>
@@ -78,12 +69,12 @@
                             <td><div class="copy-link" id="core_user">core_user</div></td>
                             <td>List of users.</td>
                             <td>tenant, id, username, firstname, lastname, sex, bithdate, status, activation_status, email, workfromdate, terminateddate, title,
-                                culture, contacts, phone, phone_activation, location, notes, sid, sso_name_id, sso_session_id, removed, create_on, last_modified, user_lead</td>
+                                culture, contacts, phone, phone_activation, location, notes, sid, sso_name_id, sso_session_id, removed, create_on, last_modified</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="core_userdav">core_userdav</div></td>
                             <td>List of users who requested an address book from the Radicale server. This table is used to avoid updating the address book for all users simultaneously.</td>
-                            <td>tenant, id, user_id</td>
+                            <td>tenant_id, user_id</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="core_usergroup">core_usergroup</div></td>
@@ -103,12 +94,12 @@
                         <tr>
                             <td><div class="copy-link" id="dbip_location">dbip_location</div></td>
                             <td>Geolocation.</td>
-                            <td>id, addr_type, ip_start, ip_end, country, stateprov, district, city, zipcode, latitude, longitude, geoname_id, timezone_offset, timezone_name, processed</td>
+                            <td>id, AddrType, ip_start, ip_end, country, stateprov, district, city, zipcode, latitude, longitude, geoname_id, timezone_offset, timezone_name, processed</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="feed_aggregate">feed_aggregate</div></td>
                             <td>Newsline.</td>
-                            <td>id, tenant, product, module, author, modified_by, created_date, modified_date, group_id, json, keywords, aggregated_date</td>
+                            <td>id, tenant, product, module, author, modified_by, created_date, modified_date, group_id, json, keywords, aggregated_date, context_id</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="feed_last">feed_last</div></td>
@@ -123,7 +114,7 @@
                         <tr>
                             <td><div class="copy-link" id="feed_users">feed_users</div></td>
                             <td>Correlation of the news feed with users.</td>
-                            <td>feed_id, user_id, aggregated_date</td>
+                            <td>feed_id, user_id</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="files_bunch_objects">files_bunch_objects</div></td>
@@ -144,7 +135,7 @@
                         <tr>
                             <td><div class="copy-link" id="files_folder">files_folder</div></td>
                             <td>List of folders.</td>
-                            <td>id, parent_id, title, folder_type, create_by, create_on, modified_by, modified_on, tenant_id, foldersCount, filesCount</td>
+                            <td>id, parent_id, title, folder_type, create_by, create_on, modified_by, modified_on, tenant_id, foldersCount, filesCount, private, has_logo</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="files_folder_tree">files_folder_tree</div></td>
@@ -179,7 +170,7 @@
                         <tr>
                             <td><div class="copy-link" id="files_thirdparty_account">files_thirdparty_account</div></td>
                             <td>Connected third-party drives.</td>
-                            <td>id, provider, customer_title, user_name, password, token, user_id, folder_type, create_on, url, tenant_id</td>
+                            <td>id, provider, customer_title, user_name, password, token, user_id, folder_type, room_type, create_on, url, tenant_id, folder_id, private, has_logo</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="files_thirdparty_app">files_thirdparty_app</div></td>
@@ -233,8 +224,8 @@
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="tenants_quota">tenants_quota</div></td>
-                            <td>Tenant quota (available features, maximum file size, maximum users, etc.).</td>
-                            <td>tenant, name, description, max_file_size, max_total_size, active_users, features, price, avangate_id, visible</td>
+                            <td>Tenant quota (available features, price, etc.).</td>
+                            <td>tenant, name, description, features, price, product_id, visible</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="tenants_quotarow">tenants_quotarow</div></td>
@@ -244,13 +235,13 @@
                         <tr>
                             <td><div class="copy-link" id="tenants_tariff">tenants_tariff</div></td>
                             <td>Tenant tariffs.</td>
-                            <td>id, tenant, tariff, stamp, quantity, comment, create_on</td>
+                            <td>id, tenant, stamp, customer_id, comment, create_on</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="tenants_tenants">tenants_tenants</div></td>
                             <td>List of tenants.</td>
                             <td>id, name, alias, mappeddomain, version, version_changed, language, timezone, trusteddomains, trusteddomainsenabled,
-                                status, statuschanged, creationdatetime, owner_id, public, publicvisibleproducts, payment_id, industry, last_modified, spam, calls</td>
+                                status, statuschanged, creationdatetime, owner_id, payment_id, industry, last_modified, spam, calls</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="webhooks_config">webhooks_config</div></td>
@@ -260,7 +251,7 @@
                         <tr>
                             <td><div class="copy-link" id="webhooks_logs">webhooks_logs</div></td>
                             <td>Logs of webhooks.</td>
-                            <td>id, config_id, creation_type, webhook_id, request_headers, request_payload, response_headers, response_payload, status, tenant_id, uid, delivery</td>
+                            <td>id, config_id, creation_time, webhook_id, request_headers, request_payload, response_headers, response_payload, status, tenant_id, uid, delivery</td>
                         </tr>
                         <tr>
                             <td><div class="copy-link" id="webstudio_index">webstudio_index</div></td>
diff --git a/Web/installation/docspace-general-config-services.aspx b/Web/installation/docspace-general-config-services.aspx
new file mode 100644
index 000000000..8465ac0e4
--- /dev/null
+++ b/Web/installation/docspace-general-config-services.aspx
@@ -0,0 +1,11 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationWorkspaceArticles.master" %>
+<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
+<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
+    <body class="docker_version docspace_community_edition">
+</asp:Content>
+<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
+	<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/DocSpace/Services/DocSpaceServices.ascx" />
+</asp:Content>
+<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
+    <div class="installationdocspace">
+</asp:Content>
\ No newline at end of file
diff --git a/Web/installation/docspace-general-config-tables.aspx b/Web/installation/docspace-general-config-tables.aspx
new file mode 100644
index 000000000..8c168cd48
--- /dev/null
+++ b/Web/installation/docspace-general-config-tables.aspx
@@ -0,0 +1,11 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationWorkspaceArticles.master" %>
+<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
+<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
+    <body class="docker_version docspace_community_edition">
+</asp:Content>
+<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
+	<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/DocSpace/Tables/DocSpaceTables.ascx" />
+</asp:Content>
+<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
+    <div class="installationdocspace">
+</asp:Content>
\ No newline at end of file
diff --git a/Web/installation/workspace-general-config-services.aspx b/Web/installation/workspace-general-config-services.aspx
deleted file mode 100644
index e19ce248a..000000000
--- a/Web/installation/workspace-general-config-services.aspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationWorkspaceArticles.master" %>
-<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
-<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
-    <body class="docker_version community_edition installation_workspace_ce">
-</asp:Content>
-<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
-	<cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/TopControls/OpensourceTop/OpensourceTop.ascx" />
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
-	<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Docker/Opensource/Services/WorkspaceServices.ascx" />
-</asp:Content>
-<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
-    <div class="installationworkspacepage enterprise">
-        <div id="SeeAlsoBlockLinks">
-            <div class="caption guides">
-                <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/070_configuration.ascx" />
-            </div>
-            <div class="caption video">
-                <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Video/130_docker_install.ascx" />
-            </div>
-        </div>
-</asp:Content>
\ No newline at end of file
diff --git a/Web/installation/workspace-general-config-tables.aspx b/Web/installation/workspace-general-config-tables.aspx
deleted file mode 100644
index d34a87938..000000000
--- a/Web/installation/workspace-general-config-tables.aspx
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationWorkspaceArticles.master" %>
-<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
-<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
-    <body class="docker_version community_edition installation_workspace_ce">
-</asp:Content>
-<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
-	<cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/TopControls/OpensourceTop/OpensourceTop.ascx" />
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
-	<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Docker/Opensource/Tables/WorkspaceTables.ascx" />
-</asp:Content>
-<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
-    <div class="installationworkspacepage enterprise">
-        <div id="SeeAlsoBlockLinks">
-            <div class="caption guides">
-                <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/070_configuration.ascx" />
-            </div>
-            <div class="caption video">
-                <cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/Video/130_docker_install.ascx" />
-            </div>
-        </div>
-</asp:Content>
\ No newline at end of file