diff --git a/files/default_catalog.templates b/files/default_catalog.templates
index f6125bb9df..b9b1844149 100644
--- a/files/default_catalog.templates
+++ b/files/default_catalog.templates
@@ -6,12 +6,18 @@ catalog.RegionOne.identity.internalURL = http://%SERVICE_HOST%:$(public_port)s/v
 catalog.RegionOne.identity.name = 'Identity Service'
 
 
-catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
-catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
-catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
+catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
+catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
+catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v2/$(tenant_id)s
 catalog.RegionOne.compute.name = 'Compute Service'
 
 
+catalog.RegionOne.volume.publicURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.adminURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.internalURL = http://%SERVICE_HOST%:8776/v1/$(tenant_id)s
+catalog.RegionOne.volume.name = 'Volume Service'
+
+
 catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud
 catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin
 catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index ed85aca03a..3f4841f9c3 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -88,6 +88,14 @@ keystone service-create \
                                  --name=keystone \
                                  --type=identity \
                                  --description="Keystone Identity Service"
+
+if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then
+    keystone service-create \
+                                 --name="nova-volume" \
+                                 --type=volume \
+                                 --description="Nova Volume Service"
+fi
+
 if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
     keystone service-create \
                                  --name=swift \