diff --git a/doc/source/user/vanilla-imagebuilder.rst b/doc/source/user/vanilla-imagebuilder.rst
index 6cafb2f..cf609fd 100644
--- a/doc/source/user/vanilla-imagebuilder.rst
+++ b/doc/source/user/vanilla-imagebuilder.rst
@@ -21,10 +21,9 @@ Elements for building vanilla images are stored in the
Sahara requires images with cloud-init package installed:
- * `For Fedora `_
- * `For Ubuntu 14 `_
- * `For CentOS 6 `_
- * `For CentOS 7 `_
+ * `For Ubuntu 16.04 `_
+ * `For CentOS 7 `_
+ * `For Fedora `_
To create vanilla images follow these steps:
diff --git a/doc/source/user/vanilla-plugin.rst b/doc/source/user/vanilla-plugin.rst
index f5710ba..967b500 100644
--- a/doc/source/user/vanilla-plugin.rst
+++ b/doc/source/user/vanilla-plugin.rst
@@ -15,20 +15,8 @@ You may build images by yourself using :doc:`vanilla-imagebuilder`.
Vanilla plugin requires an image to be tagged in Sahara Image Registry with
two tags: 'vanilla' and '' (e.g. '2.7.1').
-The default username specified for these images is different
-for each distribution:
-
-+--------------+------------+
-| OS | username |
-+==============+============+
-| Ubuntu 14 | ubuntu |
-+--------------+------------+
-| Fedora 20 | fedora |
-+--------------+------------+
-| CentOS 6 | cloud-user |
-+--------------+------------+
-| CentOS 7 | centos |
-+--------------+------------+
+The image requires a username. For more information, refer to the
+:doc:`registering-image` section.
Cluster Validation
------------------