diff --git a/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2
index 58b2bfb234..8ddc49a799 100644
--- a/playbooks/roles/os_nova/templates/nova.conf.j2
+++ b/playbooks/roles/os_nova/templates/nova.conf.j2
@@ -127,7 +127,7 @@ notification_driver = messagingv2
 
 # Cinder
 [cinder]
-catalog_info = volume:cinder:internalURL
+catalog_info = volumev2:cinderv2:internalURL
 cross_az_attach = {{ nova_cross_az_attach }}
 
 
diff --git a/playbooks/roles/os_tempest/templates/tempest.conf.j2 b/playbooks/roles/os_tempest/templates/tempest.conf.j2
index ec4e34e8bd..3eff1d43fd 100644
--- a/playbooks/roles/os_tempest/templates/tempest.conf.j2
+++ b/playbooks/roles/os_tempest/templates/tempest.conf.j2
@@ -226,7 +226,7 @@ volume_size = 1
 [volume-feature-enabled]
 api_extensions = all
 api_v1 = true
-api_v2 = false
+api_v2 = true
 backup = {{ tempest_volume_backup_enabled }}
 multi_backend = false
 snapshot = false