diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index ab74770296..d15e183f5a 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -128,9 +128,13 @@
 - name: restart stunnel
   service: name=stunnel state=restarted
 
-- name: restart cinder
+- name: restart cinder api
   service: name=openstack-cinder-api state=restarted
+
+- name: restart cinder scheduler
   service: name=openstack-cinder-scheduler state=restarted
+
+- name: restart cinder volume
   service: name=openstack-cinder-volume state=restarted
 
 - name: restart autocloud
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 44ea24b8e8..74ef3937f5 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -522,40 +522,62 @@
   # https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/5/html/Cloud_Administrator_Guide/section_manage-volumes.html
   - ini_file: dest=/etc/cinder/cinder.conf section=DEFAULT option="enabled_backends" value="equallogic-1,lvmdriver-1"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   # LVM
   - ini_file: dest=/etc/cinder/cinder.conf section="lvmdriver-1" option="volume_group" value="cinder-volumes"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="lvmdriver-1" option="volume_driver" value="cinder.volume.drivers.lvm.LVMISCSIDriver"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="lvmdriver-1" option="volume_backend_name" value="LVM_iSCSI"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   # Dell EqualLogic - http://docs.openstack.org/trunk/config-reference/content/dell-equallogic-driver.html
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="volume_driver" value="cinder.volume.drivers.eqlx.DellEQLSanISCSIDriver"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="san_ip" value="{{ IP_EQLX }}"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="san_login" value="{{ SAN_UNAME }}"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - name: set password for equallogic-1
     ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="san_password" value="{{ SAN_PW }}"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="eqlx_group_name" value="{{ EQLX_GROUP }}"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="eqlx_pool" value="{{ EQLX_POOL }}"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
   - ini_file: dest=/etc/cinder/cinder.conf section="equallogic-1" option="volume_backend_name" value="equallogic"
     notify:
-    - restart cinder
+    - restart cinder api
+    - restart cinder scheduler
+    - restart cinder volume
 
   # flush handlers here in case cinder changes and we need to restart it.
   - meta: flush_handlers