diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml
index 444b98f5..c392ba83 100644
--- a/tasks/cinder_install_source.yml
+++ b/tasks/cinder_install_source.yml
@@ -41,7 +41,6 @@
   vars:
     venv_build_distro_package_list: "{{ cinder_devel_distro_packages }}"
     venv_install_destination_path: "{{ cinder_bin | dirname }}"
-    venv_install_distro_package_list: "{{ cinder_distro_packages }}"
     venv_pip_install_args: "{{ cinder_pip_install_args }}"
     venv_pip_packages: >-
       {{ cinder_pip_packages +
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 23198238..8d048602 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -26,9 +26,6 @@ cinder_package_list: |-
   {%     set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if cinder_developer_mode | bool %}
-  {%   set _ = packages.extend(cinder_devel_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 5b448b23..86a8896f 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -20,9 +20,6 @@ tgt_service_name: tgtd
 cinder_distro_packages:
   - nfs-utils
   - rpcbind
-  - libxslt-devel
-  - postgresql-devel
-  - kmod-devel
   - kmod-libs
   - zlib-devel
   - which
@@ -38,6 +35,9 @@ cinder_service_distro_packages:
 
 cinder_devel_distro_packages:
   - git
+  - libxslt-devel
+  - kmod-devel
+  - postgresql-devel
   - systemd-devel
 
 cinder_volume_distro_packages:
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 8f670c73..a63c5748 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -26,9 +26,6 @@ cinder_package_list: |-
   {%     set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if cinder_developer_mode | bool %}
-  {%   set _ = packages.extend(cinder_devel_distro_packages) %}
-  {% endif %}
   {% if cinder_oslomsg_amqp1_enabled | bool %}
   {%   set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
   {% endif %}
diff --git a/vars/suse.yml b/vars/suse.yml
index b2a796e2..5e2592b3 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -21,11 +21,7 @@ tgt_service_name: tgtd
 cinder_distro_packages:
   - nfs-utils
   - rpcbind
-  - libxslt-devel
-  - postgresql-devel
-  - libkmod-devel
   - libkmod2
-  - zlib-devel
   - which
   - open-iscsi
 
@@ -44,8 +40,11 @@ cinder_service_distro_packages:
 
 cinder_devel_distro_packages:
   - git-core
-  - pkg-config
+  - libxslt-devel
+  - libkmod-devel
+  - postgresql-devel
   - systemd-devel
+  - zlib-devel
 
 cinder_volume_distro_packages:
   - qemu-tools
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 2b5c9514..5a17168e 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -22,12 +22,7 @@ tgt_service_name: tgt
 
 # Common apt packages
 cinder_distro_packages:
-  - libffi-dev
-  - libkmod-dev
   - libkmod2
-  - libpq-dev
-  - libssl-dev
-  - libxslt1-dev
   - nfs-common
   - open-iscsi
   - rpcbind
@@ -48,8 +43,12 @@ cinder_service_distro_packages:
   - uwsgi-plugin-python
 
 cinder_devel_distro_packages:
-  - build-essential
   - git-core
+  - libffi-dev
+  - libkmod-dev
+  - libpq-dev
+  - libssl-dev
+  - libxslt1-dev
   - libsystemd-dev
 
 cinder_volume_distro_packages: