diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 1d66f2dd..f9e0a24e 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -29,6 +29,12 @@ cinder_package_list: |-
   {% if cinder_services['cinder-backup']['group'] in group_names %}
   {%   set _ = packages.extend(cinder_backup_distro_packages) %}
   {% endif %}
+  {% if cinder_services['cinder-api']['group'] in group_names %}
+  {%   set _ = packages.extend(cinder_api_distro_packages) %}
+  {% endif %}
+  {% if cinder_services['cinder-scheduler']['group'] in group_names %}
+  {%   set _ = packages.extend(cinder_scheduler_distro_packages) %}
+  {% endif %}
   {% if cinder_oslomsg_amqp1_enabled | bool %}
   {%   set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
   {% endif %}
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 3bc349d9..e717883e 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -47,6 +47,10 @@ cinder_volume_distro_packages_tools:
   - nfs-utils
   - rpcbind
 
+cinder_api_distro_packages: []
+
+cinder_scheduler_distro_packages: []
+
 cinder_lvm_volume_distro_packages:
   - device-mapper-event
   - lvm2
diff --git a/vars/suse.yml b/vars/suse.yml
index 2d51cffc..5cefc2db 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -26,10 +26,6 @@ cinder_distro_packages:
 
 cinder_service_distro_packages:
   - openstack-cinder
-  - openstack-cinder-api
-  - openstack-cinder-backup
-  - openstack-cinder-scheduler
-  - openstack-cinder-volume
   - python-openstackclient
   - python-cursive
   - python-shade
@@ -45,7 +41,8 @@ cinder_devel_distro_packages:
   - systemd-devel
   - zlib-devel
 
-cinder_volume_distro_packages: []
+cinder_volume_distro_packages:
+  - openstack-cinder-volume
 
 cinder_volume_distro_packages_tools:
   - qemu-tools
@@ -53,6 +50,12 @@ cinder_volume_distro_packages_tools:
   - nfs-utils
   - rpcbind
 
+cinder_api_distro_packages:
+  - openstack-cinder-api
+
+cinder_scheduler_distro_packages:
+  - openstack-cinder-scheduler
+
 cinder_lvm_volume_distro_packages:
   - device-mapper
   - lvm2
@@ -60,6 +63,7 @@ cinder_lvm_volume_distro_packages:
   - tgt
 
 cinder_backup_distro_packages:
+  - openstack-cinder-backup
   - open-iscsi
   - nfs-utils
   - rpcbind
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index eec0aa59..e4153423 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -30,10 +30,6 @@ cinder_distro_packages:
   - zlibc
 
 cinder_service_distro_packages:
-  - cinder-api
-  - cinder-backup
-  - cinder-scheduler
-  - cinder-volume
   - python-openstackclient
   - python-shade
   - python-systemd
@@ -50,7 +46,8 @@ cinder_devel_distro_packages:
   - libxslt1-dev
   - libsystemd-dev
 
-cinder_volume_distro_packages: []
+cinder_volume_distro_packages:
+  - cinder-volume
 
 cinder_volume_distro_packages_tools:
   - qemu-utils
@@ -58,6 +55,12 @@ cinder_volume_distro_packages_tools:
   - nfs-common
   - rpcbind
 
+cinder_api_distro_packages:
+  - cinder-api
+
+cinder_scheduler_distro_packages:
+  - cinder-scheduler
+
 cinder_lvm_volume_distro_packages:
   - dmeventd
   - lvm2
@@ -66,6 +69,7 @@ cinder_lvm_volume_distro_packages:
   - thin-provisioning-tools
 
 cinder_backup_distro_packages:
+  - cinder-backup
   - open-iscsi
   - nfs-common
   - rpcbind