diff --git a/templates/cinder-uwsgi.ini.j2 b/templates/cinder-uwsgi.ini.j2
index 2792d06d..4f1fcda9 100644
--- a/templates/cinder-uwsgi.ini.j2
+++ b/templates/cinder-uwsgi.ini.j2
@@ -5,6 +5,9 @@ gid = {{ cinder_system_group_name }}
 {% if cinder_install_method == 'source' %}
 virtualenv = /openstack/venvs/cinder-{{ cinder_venv_tag }}
 {% endif %}
+{% if cinder_install_method == 'distro' and (ansible_os_family | lower) == 'debian' %}
+plugin = python3
+{% endif %}
 wsgi-file = {{ cinder_bin }}/{{ item.wsgi_name }}
 http = {{ item.uwsgi_bind_address }}:{{ item.uwsgi_port }}
 
diff --git a/vars/debian.yml b/vars/debian.yml
index eec0aa59..9940c423 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -30,16 +30,11 @@ cinder_distro_packages:
   - zlibc
 
 cinder_service_distro_packages:
-  - cinder-api
-  - cinder-backup
-  - cinder-scheduler
-  - cinder-volume
+  - python3-cinder
   - python-openstackclient
   - python-shade
   - python-systemd
   - python3-systemd
-  - uwsgi
-  - uwsgi-plugin-python
 
 cinder_devel_distro_packages:
   - git-core
@@ -50,6 +45,10 @@ cinder_devel_distro_packages:
   - libxslt1-dev
   - libsystemd-dev
 
+cinder_api_distro_packages:
+  - uwsgi
+  - uwsgi-plugin-python3
+
 cinder_volume_distro_packages: []
 
 cinder_volume_distro_packages_tools:
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 1d66f2dd..43a9f143 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -20,6 +20,9 @@
 #
 cinder_package_list: |-
   {% set packages = cinder_service_distro_packages %}
+  {% if cinder_services['cinder-api']['group'] in group_names %}
+  {%   set _ = packages.extend(cinder_api_distro_packages) %}
+  {% endif %}
   {% if cinder_services['cinder-volume']['group'] in group_names %}
   {%   set _ = packages.extend(cinder_volume_distro_packages) %}
   {%   if cinder_backend_lvm_inuse | bool %}
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 80ab90c8..4f15beff 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -28,8 +28,6 @@ cinder_service_distro_packages:
   - python-openstackclient
   - python2-shade
   - systemd-python
-  - uwsgi
-  - uwsgi-plugin-python
 
 cinder_devel_distro_packages:
   - git
@@ -39,6 +37,10 @@ cinder_devel_distro_packages:
   - systemd-devel
   - zlib-devel
 
+cinder_api_distro_packages:
+  - uwsgi
+  - uwsgi-plugin-python
+
 cinder_volume_distro_packages: []
 
 cinder_volume_distro_packages_tools:
diff --git a/vars/suse.yml b/vars/suse.yml
index 2d51cffc..f4cf2757 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -34,6 +34,8 @@ cinder_service_distro_packages:
   - python-cursive
   - python-shade
   - python-systemd
+
+cinder_api_distro_packages:
   - uwsgi
   - uwsgi-python