diff --git a/doc/source/users/index.rst b/doc/source/users/index.rst
index 42170b76..06ba422e 100644
--- a/doc/source/users/index.rst
+++ b/doc/source/users/index.rst
@@ -98,6 +98,7 @@ The following services have exposed *Resource* classes.
    Database <resources/database/index>
    Identity <resources/identity/index>
    Image <resources/image/index>
+   Keystore <resources/keystore/index>
    Network <resources/network/index>
    Orchestration <resources/orchestration/index>
    Object Store <resources/object_store/index>
diff --git a/doc/source/users/resources/keystore/index.rst b/doc/source/users/resources/keystore/index.rst
new file mode 100644
index 00000000..046a2459
--- /dev/null
+++ b/doc/source/users/resources/keystore/index.rst
@@ -0,0 +1,9 @@
+Keystore Resources
+==================
+
+.. toctree::
+   :maxdepth: 1
+
+   v1/container
+   v1/order
+   v1/secret
diff --git a/doc/source/users/resources/keystore/v1/container.rst b/doc/source/users/resources/keystore/v1/container.rst
new file mode 100644
index 00000000..ef958ee1
--- /dev/null
+++ b/doc/source/users/resources/keystore/v1/container.rst
@@ -0,0 +1,12 @@
+openstack.keystore.v1.container
+===============================
+
+.. automodule:: openstack.keystore.v1.container
+
+The Container Class
+-------------------
+
+The ``Container`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.keystore.v1.container.Container
+   :members:
diff --git a/doc/source/users/resources/keystore/v1/order.rst b/doc/source/users/resources/keystore/v1/order.rst
new file mode 100644
index 00000000..eb46859b
--- /dev/null
+++ b/doc/source/users/resources/keystore/v1/order.rst
@@ -0,0 +1,12 @@
+openstack.keystore.v1.order
+===========================
+
+.. automodule:: openstack.keystore.v1.order
+
+The Order Class
+---------------
+
+The ``Order`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.keystore.v1.order.Order
+   :members:
diff --git a/doc/source/users/resources/keystore/v1/secret.rst b/doc/source/users/resources/keystore/v1/secret.rst
new file mode 100644
index 00000000..dfdbe447
--- /dev/null
+++ b/doc/source/users/resources/keystore/v1/secret.rst
@@ -0,0 +1,12 @@
+openstack.keystore.v1.secret
+============================
+
+.. automodule:: openstack.keystore.v1.secret
+
+The Secret Class
+----------------
+
+The ``Secret`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.keystore.v1.secret.Secret
+   :members: