diff --git a/.zuul.yaml b/.zuul.yaml
index 74ebce3..114d918 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -54,15 +54,24 @@
       - tempest-plugin-jobs
     check:
       jobs:
-        - heat-functional
-        - heat-functional-legacy
-        - heat-functional-convg-train
-        - heat-functional-orig-train
-        - heat-functional-ussuri
-        - heat-functional-victoria
-        - heat-functional-wallaby
+        - heat-functional:
+            voting: false
+        - heat-functional-legacy:
+            voting: false
+        - heat-functional-convg-train:
+            voting: false
+        - heat-functional-orig-train:
+            voting: false
+        - heat-functional-ussuri:
+            voting: false
+        - heat-functional-victoria:
+            voting: false
+        - heat-functional-wallaby:
+            voting: false
     gate:
       queue: heat
       jobs:
-        - heat-functional
-        - heat-functional-legacy
+        - heat-functional:
+            voting: false
+        - heat-functional-legacy:
+            voting: false
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000..caeb801
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,19 @@
+The source repository for this project can be found at:
+
+   https://opendev.org/openstack/heat-tempest-plugin
+
+Pull requests submitted through GitHub are not monitored.
+
+To start contributing to OpenStack, follow the steps in the contribution guide
+to set up and use Gerrit:
+
+   https://docs.openstack.org/contributors/code-and-documentation/quick-start.html
+
+Bugs should be filed on Storyboard:
+
+   https://storyboard.openstack.org/#!/project/openstack/heat-tempest-plugin
+
+For more specific information about contributing to this repository, see the
+heat-tempest-plugin contributor guide:
+
+   https://opendev.org/openstack/heat-tempest-plugin/src/branch/master/doc/source/contributor/contributing.rst
diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst
new file mode 100644
index 0000000..68e2618
--- /dev/null
+++ b/doc/source/contributor/contributing.rst
@@ -0,0 +1,48 @@
+============================
+So You Want to Contribute...
+============================
+For general information on contributing to OpenStack, please check out the
+`contributor guide <https://docs.openstack.org/contributors/>`_ to get started.
+It covers all the basics that are common to all OpenStack projects: the accounts
+you need, the basics of interacting with our Gerrit review system, how we
+communicate as a community, etc.
+Below will cover the more project specific information you need to get started
+with heat-tempest-plugin.
+
+Communication
+~~~~~~~~~~~~~
+* IRC channel #heat at OFTC
+* Mailing list (prefix subjects with ``[heat]`` for faster responses)
+  http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
+
+Contacting the Core Team
+~~~~~~~~~~~~~~~~~~~~~~~~
+Please refer the `heat-tempest-plugin Core Team
+<https://review.opendev.org/admin/groups/b4b16f97f2b8416cb0111c0bec5df885bd779347,members>`_ contacts.
+
+New Feature Planning
+~~~~~~~~~~~~~~~~~~~~
+heat-tempest-plugin features are tracked on `Storyboard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+Please specify the reported story with `heat-tempest-plugin`.
+
+Task Tracking
+~~~~~~~~~~~~~
+We track our tasks in `Storyboard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+Please specify the reported story with `heat-tempest-plugin`.
+
+Reporting a Bug
+~~~~~~~~~~~~~~~
+You found an issue and want to make sure we are aware of it? You can do so on
+`StoryBoard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+Please specify the reported story with `heat-tempest-plugin`.
+
+Getting Your Patch Merged
+~~~~~~~~~~~~~~~~~~~~~~~~~
+All changes proposed to the heat-tempest-plugin project require one or two +2 votes
+from heat-tempest-plugin core reviewers before one of the core reviewers can approve
+patch by giving ``Workflow +1`` vote.
+
+Project Team Lead Duties
+~~~~~~~~~~~~~~~~~~~~~~~~
+All common PTL duties are enumerated in the `PTL guide
+<https://docs.openstack.org/project-team-guide/ptl.html>`_.
diff --git a/heat_tempest_plugin/services/clients.py b/heat_tempest_plugin/services/clients.py
index d6e1dfb..ae4cbe2 100644
--- a/heat_tempest_plugin/services/clients.py
+++ b/heat_tempest_plugin/services/clients.py
@@ -62,7 +62,7 @@
     calling various OpenStack APIs.
     """
 
-    CINDERCLIENT_VERSION = '2'
+    CINDERCLIENT_VERSION = '3'
     HEATCLIENT_VERSION = '1'
     NOVA_API_VERSION = '2.1'
     GNOCCHI_VERSION = '1'