diff --git a/service/cinder-api.yaml b/service/cinder-api.yaml
index 094a57d..0b29d1c 100644
--- a/service/cinder-api.yaml
+++ b/service/cinder-api.yaml
@@ -36,26 +36,70 @@ service:
             - cinder-user-create
           type: single
           command: openstack role add --project service --user {{ cinder.username }} admin
+
         - name: cinder-service-create
           dependencies:
             - keystone
           type: single
-          command: openstack service create --name cinder --description "OpenStack Cinder Service" volumev2
+          command: openstack service create --name cinder --description "OpenStack Cinder Service" volume
         - name: cinder-public-endpoint-create
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 public {{ address('cinder-api', cinder.api_port, external=True, with_scheme=True) }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volume public {{ address('cinder-api', cinder.api_port, external=True, with_scheme=True) }}/v1/$\(project_id\)s
         - name: cinder-internal-endpoint-create
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 internal {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volume internal {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v1/$\(project_id\)s
         - name: cinder-admin-endpoint-create
           dependencies:
             - cinder-service-create
           type: single
-          command: openstack endpoint create --region RegionOne volumev2 admin {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/%\(tenant_id\)s
+          command: openstack endpoint create --region RegionOne volume admin {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v1/$\(project_id\)s
+
+        - name: cinder-service-create-v2
+          dependencies:
+            - keystone
+          type: single
+          command: openstack service create --name cinder --description "OpenStack Cinder Service V2" volumev2
+        - name: cinder-public-endpoint-create-v2
+          dependencies:
+            - cinder-service-create-v2
+          type: single
+          command: openstack endpoint create --region RegionOne volumev2 public {{ address('cinder-api', cinder.api_port, external=True, with_scheme=True) }}/v2/$\(project_id\)s
+        - name: cinder-internal-endpoint-create-v2
+          dependencies:
+            - cinder-service-create-v2
+          type: single
+          command: openstack endpoint create --region RegionOne volumev2 internal {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/$\(project_id\)s
+        - name: cinder-admin-endpoint-create-v2
+          dependencies:
+            - cinder-service-create-v2
+          type: single
+          command: openstack endpoint create --region RegionOne volumev2 admin {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/$\(project_id\)s
+
+        - name: cinder-service-create-v3
+          dependencies:
+            - keystone
+          type: single
+          command: openstack service create --name cinder --description "OpenStack Cinder Service V3" volumev3
+        - name: cinder-public-endpoint-create-v3
+          dependencies:
+            - cinder-service-create-v3
+          type: single
+          command: openstack endpoint create --region RegionOne volumev3 public {{ address('cinder-api', cinder.api_port, external=True, with_scheme=True) }}/v3/$\(project_id\)s
+        - name: cinder-internal-endpoint-create-v3
+          dependencies:
+            - cinder-service-create-v3
+          type: single
+          command: openstack endpoint create --region RegionOne volumev3 internal {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v3/$\(project_id\)s
+        - name: cinder-admin-endpoint-create-v3
+          dependencies:
+            - cinder-service-create-v3
+          type: single
+          command: openstack endpoint create --region RegionOne volumev3 admin {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v3/$\(project_id\)s
+
       daemon:
         command: cinder-api --config-file /etc/cinder/cinder.conf
         files: