diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index cae3ab5..73480df 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -98,6 +98,17 @@ def add_glance_config(ctxt, keystone_session):
         ctxt['image_alt_id'] = image_alt[0].id
 
 
+def add_cinder_config(ctxt, keystone_session):
+    volume_types = ['volumev2', 'volumev3']
+    keystone_client = openstack_utils.get_keystone_session_client(
+        keystone_session)
+    for volume_type in volume_types:
+        service = keystone_client.services.list(type=volume_type)
+        if service:
+            ctxt['catalog_type'] = volume_type
+            break
+
+
 def add_keystone_config(ctxt, keystone_session):
     keystone_client = openstack_utils.get_keystone_session_client(
         keystone_session)
@@ -141,6 +152,7 @@ def get_tempest_context():
     add_nova_config(ctxt, keystone_session)
     add_neutron_config(ctxt, keystone_session)
     add_glance_config(ctxt, keystone_session)
+    add_cinder_config(ctxt, keystone_session)
     add_keystone_config(ctxt, keystone_session)
     add_environment_var_config(ctxt)
     add_access_protocol(ctxt)
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
index ec95577..e4b94ba 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
@@ -88,10 +88,7 @@ zaqar = false
 [volume]
 backend_names = cinder-ceph
 storage_protocol = ceph
-# NOTE(coreycb): Need to enalbe catalog_type, determined by:
-# volume_version=$(openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev3 ||
-#                  openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev2)
-# catalog_type = __VOLUME_VERSION__
+catalog_type = {catalog_type}
 
 [volume-feature-enabled]
 backup = false"""
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
index 887b0b5..6f71765 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
@@ -90,6 +90,7 @@ zaqar = false
 [volume]
 backend_names = cinder-ceph
 storage_protocol = ceph
+catalog_type = {catalog_type}
 
 [volume-feature-enabled]
 backup = false"""