diff --git a/cinder-controller.yml b/cinder-controller.yml
new file mode 100644
index 0000000..ce6f7e9
--- /dev/null
+++ b/cinder-controller.yml
@@ -0,0 +1,9 @@
+---
+- hosts: all
+  name: Dummy to gather facts
+  tasks: []
+
+- hosts: cinder-controller
+  become: True
+  roles:
+     - cinder-controller
diff --git a/cinder-storage.yml b/cinder-storage.yml
new file mode 100644
index 0000000..7c2b818
--- /dev/null
+++ b/cinder-storage.yml
@@ -0,0 +1,9 @@
+---
+- hosts: all
+  name: Dummy to gather facts
+  tasks: []
+
+- hosts: cinder-storage
+  become: True
+  roles:
+     - cinder-storage
diff --git a/hosts b/hosts
index a0526af..31f89f5 100644
--- a/hosts
+++ b/hosts
@@ -39,5 +39,11 @@ openstack01-node01 provider_interface_name=ens192
 [nova-controller]
 openstack01-node03
 
+[cinder-controller]
+openstack01-node03
+
+[cinder-storage]
+openstack01-node01 storage_volume=/dev/loop0
+
 [nova-compute]
 openstack01-node04 provider_interface_name=dummy0
diff --git a/roles/cinder-controller/tasks/main.yml b/roles/cinder-controller/tasks/main.yml
index b9471ac..96e3d67 100644
--- a/roles/cinder-controller/tasks/main.yml
+++ b/roles/cinder-controller/tasks/main.yml
@@ -31,8 +31,8 @@
     state: directory
     mode: 0777
   with_items:
-      - /srv/cinder
-      - /srv/cinder/root
+      - /srv/cinder-controller
+      - /srv/cinder-controller/root
 
 - name: install service file.
   template:
@@ -48,7 +48,7 @@
   command: >
              /usr/bin/docker run --rm
              {{ env_vars }}
-             -v /srv/cinder/root:/root \
+             -v /srv/cinder-controller/root:/root \
              {{ docker_image }} /etc/bootstrap.sh
   tags: bootstrap
 
diff --git a/roles/cinder-controller/templates/cinder-controller.service b/roles/cinder-controller/templates/cinder-controller.service
index 0dc639e..6814eac 100644
--- a/roles/cinder-controller/templates/cinder-controller.service
+++ b/roles/cinder-controller/templates/cinder-controller.service
@@ -10,7 +10,7 @@ ExecStartPre=-/usr/bin/docker kill %n
 ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
   {{ env_vars | replace('\n', '') }} \
-  -v /srv/glance/root:/root \
+  -v /srv/cinder-controller/root:/root \
   -p 8776:8776 \
   {{ docker_image }}