diff --git a/doc/source/userdoc/cdh_imagebuilder.rst b/doc/source/userdoc/cdh_imagebuilder.rst
index a0da9e0a01..7d3dc78a41 100644
--- a/doc/source/userdoc/cdh_imagebuilder.rst
+++ b/doc/source/userdoc/cdh_imagebuilder.rst
@@ -4,7 +4,8 @@ Building Images for Cloudera Plugin
 ===================================
 
 In this document you will find instructions on how to build Ubuntu and CentOS
-images with Cloudera Express (now only 5.0.0 and 5.3.0 versions are supported).
+images with Cloudera Express (now only 5.0.0, 5.3.0 and 5.4.0 versions are
+supported).
 
 Apache Hadoop. To simplify the task of building such images we use
 `Disk Image Builder <https://github.com/openstack/diskimage-builder>`_.
@@ -38,20 +39,20 @@ To create cloudera images follow these steps:
    you should use the "-i ubuntu|centos" parameter to assign the operating
    system (the cloudera plugin only supports Ubuntu and Centos). If you want
    to create the image only for a specific Cloudera version, you should use the
-   "-v 5.0|5.3" parameter to assign the version. Below is an example to create
-   Cloudera images for both Ubuntu and CentOS with Cloudera Express 5.3.0
+   "-v 5.0|5.3|5.4" parameter to assign the version. Below is an example to create
+   Cloudera images for both Ubuntu and CentOS with Cloudera Express 5.4.0
    version.
 
    .. sourcecode:: console
 
-      tox -e venv -- sahara-image-create -p cloudera -v 5.3
+      tox -e venv -- sahara-image-create -p cloudera -v 5.4
 
    If you want to create only an Ubuntu image, you may use following example
    for that.
 
    .. sourcecode:: console
 
-      tox -e venv -- sahara-image-create -p cloudera -i ubuntu -v 5.3
+      tox -e venv -- sahara-image-create -p cloudera -i ubuntu -v 5.4
 
    NOTE: If you don't want to use default values, you should explicitly set the
    values of your required parameters.
diff --git a/doc/source/userdoc/cdh_plugin.rst b/doc/source/userdoc/cdh_plugin.rst
index c8129b4eda..9e0e296be8 100644
--- a/doc/source/userdoc/cdh_plugin.rst
+++ b/doc/source/userdoc/cdh_plugin.rst
@@ -11,10 +11,11 @@ explicitly enable or disable it in "plugins" line.
 You need to build images using :doc:`cdh_imagebuilder` to produce images used
 to provision cluster or you could download prepared images from
 http://sahara-files.mirantis.com/images/upstream/kilo/
-They already have Cloudera Express installed (5.0.0 or 5.3.0 version).
+They already have Cloudera Express installed (5.0.0, 5.3.0, or 5.4.0 version).
 
 The cloudera plugin requires an image to be tagged in Sahara Image Registry with
-two tags: 'cdh' and '<cloudera version>' (e.g. '5' or '5.3.0').
+two tags: 'cdh' and '<cloudera version>' (e.g. '5', '5.3.0' or '5.4.0', here '5'
+stands for '5.0.0').
 
 The default username specified for these images is different for each
 distribution:
@@ -24,7 +25,7 @@ distribution:
 +==============+============+
 | Ubuntu 12.04 | ubuntu     |
 +--------------+------------+
-| CentOS 6.5   | cloud-user |
+| CentOS 6.6   | cloud-user |
 +--------------+------------+
 
 Services Supported
@@ -33,7 +34,8 @@ Services Supported
 Currently below services are supported in both versions of Cloudera plugin:
 HDFS, Oozie, YARN, Spark, Zookeeper, Hive, Hue, HBase. 5.3.0 version
 of Cloudera Plugin also supported following services: Impala, Flume, Solr, Sqoop,
-and Key-value Store Indexer.
+and Key-value Store Indexer. 5.4.0 version added KMS service support based on
+5.3.0 version.
 
 .. note::
 
@@ -42,6 +44,16 @@ and Key-value Store Indexer.
     functionality, using Sentry service will not really take any effect, and
     other services depending on Sentry will not do any authentication too.
 
+High Availablity Support
+------------------------
+
+Currently HDFS NameNode High Availability is supported in Cloudera 5.4.0 version.
+You can refer to :doc:`features` for the detail info.
+
+YARN ResourceManager High Availability is supported in Cloudera 5.4.0 version.
+This feature adds redundancy in the form of an Active/Standby ResourceManager
+pair to avoid the failure of single RM. Upon failover, the Standby RM become
+Active so that the applications can resume from their last check-pointed state.
 
 Cluster Validation
 ------------------