diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index d52474616b..b29a86862c 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -168,8 +168,12 @@ The following Launchpad Bugs areas are available:
 -  `Bugs: OpenStack Object Storage
    (swift) <https://bugs.launchpad.net/swift>`__
 
+-  `Bugs: Application catalog (murano) <https://bugs.launchpad.net/murano>`__
+
 -  `Bugs: Bare metal service (ironic) <https://bugs.launchpad.net/ironic>`__
 
+-  `Bugs: Containers service (magnum) <https://bugs.launchpad.net/magnum>`__
+
 -  `Bugs: Data processing service
    (sahara) <https://bugs.launchpad.net/sahara>`__
 
@@ -177,6 +181,8 @@ The following Launchpad Bugs areas are available:
 
 -  `Bugs: Orchestration (heat) <https://bugs.launchpad.net/heat>`__
 
+-  `Bugs: Shared file systems (manila) <https://bugs.launchpad.net/manila>`__
+
 -  `Bugs: Telemetry
    (ceilometer) <https://bugs.launchpad.net/ceilometer>`__
 
diff --git a/doc/common-rst/cli_install_openstack_command_line_clients.rst b/doc/common-rst/cli_install_openstack_command_line_clients.rst
index ad2fe72f78..457f5a636a 100644
--- a/doc/common-rst/cli_install_openstack_command_line_clients.rst
+++ b/doc/common-rst/cli_install_openstack_command_line_clients.rst
@@ -153,6 +153,12 @@ for each client. The following values are valid:
 
 -  ``heat`` - Orchestration API
 
+-  ``magnum`` - Containers service API
+
+-  ``manila`` - Shared file systems API
+
+-  ``murano`` - Application catalog API
+
 -  ``neutron`` - Networking API
 
 -  ``nova`` - Compute API and extensions
diff --git a/doc/common-rst/cli_overview.rst b/doc/common-rst/cli_overview.rst
index b2cc0cae77..78a7d471f9 100644
--- a/doc/common-rst/cli_overview.rst
+++ b/doc/common-rst/cli_overview.rst
@@ -31,6 +31,9 @@ service with its package name and description.
 +----------------+----------+-----------------------+------------------------+
 |Service         |Client    |Package                |Description             |
 +================+==========+=======================+========================+
+|Application     |murano    |python-muranoclient    |Create and manage       |
+|catalog         |          |                       |applications.           |
++----------------+----------+-----------------------+------------------------+
 |Block Storage   |cinder    |python-cinderclient    |Create and manage       |
 |                |          |                       |volumes.                |
 +----------------+----------+-----------------------+------------------------+
@@ -38,6 +41,9 @@ service with its package name and description.
 |                |          |                       |images, instances, and  |
 |                |          |                       |flavors.                |
 +----------------+----------+-----------------------+------------------------+
+|Containers      |magnum    |python-magnumclient    |Create and manage       |
+|service         |          |                       |containers.             |
++----------------+----------+-----------------------+------------------------+
 |Database service|trove     |python-troveclient     |Create and manage       |
 |                |          |                       |databases.              |
 +----------------+----------+-----------------------+------------------------+
@@ -69,6 +75,9 @@ service with its package name and description.
 |                |          |                       |resources, and update   |
 |                |          |                       |and delete stacks.      |
 +----------------+----------+-----------------------+------------------------+
+|Shared file     |manila    |python-manilaclient    |Create and manage       |
+|systems         |          |                       |shared file systems     |
++----------------+----------+-----------------------+------------------------+
 |Telemetry       |ceilometer|python-ceilometerclient|Create and collect      |
 |                |          |                       |measurements across     |
 |                |          |                       |OpenStack.              |
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 09a0ddb7bc..51c5d6451a 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -280,11 +280,21 @@
                     (swift)</link></para>
             </listitem>
             <!-- Modules, sorted alphabetically -->
+            <listitem>
+                <para><link
+                        xlink:href="https://bugs.launchpad.net/murano"
+                        >Bugs: Application catalog (murano)</link></para>
+            </listitem>
             <listitem>
                 <para><link
                         xlink:href="https://bugs.launchpad.net/ironic"
                         >Bugs: Bare metal service (ironic)</link></para>
             </listitem>
+            <listitem>
+                <para><link
+                        xlink:href="https://bugs.launchpad.net/magnum"
+                        >Bugs: Containers service (magnum)</link></para>
+            </listitem>
             <listitem>
                 <para><link
                         xlink:href="https://bugs.launchpad.net/sahara"
@@ -301,6 +311,11 @@
                         xlink:href="https://bugs.launchpad.net/heat"
                         >Bugs: Orchestration (heat)</link></para>
             </listitem>
+            <listitem>
+                <para><link
+                        xlink:href="https://bugs.launchpad.net/manila"
+                        >Bugs: Shared file systems (manila)</link></para>
+            </listitem>
             <listitem>
                 <para><link
                         xlink:href="https://bugs.launchpad.net/ceilometer"
diff --git a/doc/common/section_cli_install.xml b/doc/common/section_cli_install.xml
index 81b1298098..4356baabaf 100644
--- a/doc/common/section_cli_install.xml
+++ b/doc/common/section_cli_install.xml
@@ -205,6 +205,18 @@
                 <para><literal>trove</literal> - Database service
                     API</para>
             </listitem>
+            <listitem>
+                <para><literal>magnum</literal> - Containers service
+                    API</para>
+            </listitem>
+            <listitem>
+                <para><literal>manila</literal> - Shared file systems
+                    API</para>
+            </listitem>
+            <listitem>
+                <para><literal>murano</literal> - Application catalog
+                    API</para>
+            </listitem>
             <listitem>
                 <para><literal>openstack</literal> - Common OpenStack client
                     supporting multiple services</para>
diff --git a/doc/common/section_cli_overview.xml b/doc/common/section_cli_overview.xml
index df1dbed51f..f6b6b11540 100644
--- a/doc/common/section_cli_overview.xml
+++ b/doc/common/section_cli_overview.xml
@@ -108,6 +108,24 @@
                 <td><package>python-saharaclient</package></td>
                 <td>Creates and manages Hadoop clusters on OpenStack.</td>
             </tr>
+            <tr>
+                <td>Containers service</td>
+                <td><command>magnum</command></td>
+                <td><package>python-magnumclient</package></td>
+                <td>Create and manage containers.</td>
+            </tr>
+            <tr>
+                <td>Shared file systems</td>
+                <td><command>manila</command></td>
+                <td><package>python-manilaclient</package></td>
+                <td>Create and manage shared file systems.</td>
+            </tr>
+            <tr>
+                <td>Application catalog</td>
+                <td><command>murano</command></td>
+                <td><package>python-muranoclient</package></td>
+                <td>Create and manage application catalog.</td>
+            </tr>
             <tr>
                 <td>Common client</td>
                 <td><command>openstack</command></td>