diff --git a/tasks/swift_install_source.yml b/tasks/swift_install_source.yml
index a46ee41e..6bc72dfa 100644
--- a/tasks/swift_install_source.yml
+++ b/tasks/swift_install_source.yml
@@ -40,8 +40,8 @@
     name: "python_venv_build"
     private: yes
   vars:
+    venv_build_distro_package_list: "{{ swift_devel_distro_packages }}"
     venv_install_destination_path: "{{ swift_bin | dirname }}"
-    venv_install_distro_package_list: "{{ swift_distro_packages }}"
     venv_pip_install_args: "{{ swift_pip_install_args }}"
     venv_pip_packages: "{{ swift_pip_packages }}"
     venv_facts_when_changed:
diff --git a/vars/debian.yml b/vars/debian.yml
index 4f87b372..61073b53 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -16,18 +16,15 @@
 cache_timeout: 600
 
 swift_distro_packages:
-  - curl
-  - git-core
+  - liberasurecode1
   - openssh-server
   - openssh-client
   - rsync
 
 swift_devel_distro_packages:
-  - gcc
-  - liberasurecode1
+  - git-core
   - liberasurecode-dev
   - libffi-dev
-  - python-dev
   - libssl-dev
 
 swift_service_distro_packages:
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 1610246e..cf942909 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -14,21 +14,17 @@
 # limitations under the License.
 
 swift_distro_packages:
-  - curl
-  - git
+  - cronie
+  - cronie-anacron
+  - liberasurecode
   - openssh-server
   - openssh-clients
   - rsync
-  - cronie
-  - cronie-anacron
-  - which
 
 swift_devel_distro_packages:
-  - gcc
-  - liberasurecode
+  - git
   - liberasurecode-devel
   - libffi-devel
-  - python-devel
   - openssl-devel
 
 swift_service_distro_packages:
@@ -39,4 +35,4 @@ swift_service_distro_packages:
 
 swift_rsync_service_name: rsyncd
 
-swift_sshd: sshd
\ No newline at end of file
+swift_sshd: sshd
diff --git a/vars/source_install.yml b/vars/source_install.yml
index d50a5717..ac48e245 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-swift_package_list: "{{ swift_distro_packages + swift_devel_distro_packages }}"
+swift_package_list: "{{ swift_distro_packages }}"
 _swift_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"
diff --git a/vars/suse.yml b/vars/suse.yml
index 8a6a3867..0c109c00 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -15,20 +15,16 @@
 # limitations under the License.
 
 swift_distro_packages:
-  - curl
-  - git-core
-  - openssh
-  - rsync
   - cronie
   - cronie-anacron
-  - which
+  - liberasurecode1
+  - openssh
+  - rsync
 
 swift_devel_distro_packages:
-  - gcc
-  - liberasurecode1
+  - git-core
   - liberasurecode-devel
   - libffi-devel
-  - python-devel
   - libopenssl-devel
 
 swift_service_distro_packages: