diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst
index 841c08bb..1b61b985 100644
--- a/doc/source/basic_deployment/basic_deployment_cli.rst
+++ b/doc/source/basic_deployment/basic_deployment_cli.rst
@@ -1,3 +1,5 @@
+.. _basic-deployment-cli:
+
 Basic Deployment (CLI)
 ======================
 
@@ -410,6 +412,8 @@ subnet. If needed, define the nameserver to be used for the environment::
    In virtual environments, the libvirt default network DHCP server address,
    typically 192.168.122.1, can be used as the overcloud nameserver.
 
+.. _deploy-the-overcloud:
+
 Deploy the Overcloud
 --------------------
 
diff --git a/doc/source/containers_deployment/index.rst b/doc/source/containers_deployment/index.rst
index 3e863d64..d8dd01b3 100644
--- a/doc/source/containers_deployment/index.rst
+++ b/doc/source/containers_deployment/index.rst
@@ -13,5 +13,6 @@ the undercloud or the overcloud.
    :maxdepth: 1
 
    undercloud
+   overcloud
    architecture
    tips_tricks
diff --git a/doc/source/containers_deployment/overcloud.rst b/doc/source/containers_deployment/overcloud.rst
new file mode 100644
index 00000000..c7a2a336
--- /dev/null
+++ b/doc/source/containers_deployment/overcloud.rst
@@ -0,0 +1,68 @@
+Containers based Overcloud Deployment
+======================================
+
+.. Warning::
+
+   The TripleO containers support is still under heavy development. Things
+   documented here may change during the Pike cycle.
+
+This documentation explains how to deploy a fully containerized overcloud on
+Docker. This feature is supported starting with Pike.
+
+The requirements for a containerized overcloud are the same as for any other
+overcloud deployment. The real difference is in where the overcloud services
+will be deployed (containers vs base OS).
+
+Architecture
+------------
+
+The docker-based overcloud architecture is not very different from the
+baremetal/VM based one. The services deployed in the traditional baremetal
+overcloud are also deployed in the docker-based one.
+
+One obvious difference between these 2 types of deployments is that the
+openstack services are deployed as containers in a container runtime rather than
+in the host operating system. This reduces the required packages in the host to
+the bare minimum for running the container runtime and managing the base network
+layer.
+
+
+Manual overcloud deployment
+----------------------------
+
+This section explains how to deploy a containerized undercloud manually. For an
+automated overcloud deployment, please follow the steps in the
+`Using TripleO Quickstart`_ section below.
+
+Preparing the environment
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To prepare your environment, you must follow all the steps described in the
+:ref:`basic-deployment-cli` documentation. Stop right at the
+:ref:`deploy-the-overcloud` section.
+
+
+Deploying the containerized Overcloud
+-------------------------------------
+
+A containerized overcloud deployment follows all the steps described in the
+baremetal :ref:`deploy-the-overcloud` documentation with the exception that it
+requires an extra environment file to be added to the `openstack overcloud
+deploy` command::
+
+  -e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml
+
+
+Using TripleO Quickstart
+------------------------
+
+.. note:: Please refer to the `TripleO Quickstart`_ docs for more info about
+          quickstart, the minimum requirements, the setup process and the
+          available plugins.
+
+
+The command below will deploy a containerized overcloud on top of a baremetal undercloud::
+
+    bash quickstart.sh --config=~/.quickstart/config/general_config/containers_minimal.yml $VIRTHOST
+
+..  _TripleO Quickstart: https://docs.openstack.org/developer/tripleo-quickstart/