diff --git a/vars/debian.yml b/vars/debian.yml
index f944958b..324ca3f6 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -17,14 +17,16 @@ cache_timeout: 600
 
 swift_distro_packages:
   - curl
-  - gcc
   - git-core
+  - openssh-server
+  - rsync
+
+swift_devel_distro_packages:
+  - gcc
   - liberasurecode1
   - liberasurecode-dev
   - libffi-dev
-  - openssh-server
   - python-dev
-  - rsync
   - libssl-dev
 
 swift_service_distro_packages:
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index b6eb2d76..d4ea7935 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -15,19 +15,21 @@
 
 swift_distro_packages:
   - curl
-  - gcc
   - git
-  - liberasurecode
-  - liberasurecode-devel
-  - libffi-devel
   - openssh-server
-  - python-devel
   - rsync
-  - openssl-devel
   - cronie
   - cronie-anacron
   - which
 
+swift_devel_distro_packages:
+  - gcc
+  - liberasurecode
+  - liberasurecode-devel
+  - libffi-devel
+  - python-devel
+  - openssl-devel
+
 swift_service_distro_packages:
   - openstack-swift
   - python-keystonemiddleware
diff --git a/vars/source_install.yml b/vars/source_install.yml
index ac48e245..d50a5717 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_package_list: "{{ swift_distro_packages + swift_devel_distro_packages }}"
 _swift_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"
diff --git a/vars/suse.yml b/vars/suse.yml
index 9f54470e..1a89b936 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -16,19 +16,21 @@
 
 swift_distro_packages:
   - curl
-  - gcc
   - git-core
-  - liberasurecode1
-  - liberasurecode-devel
-  - libffi-devel
   - openssh
-  - python-devel
   - rsync
-  - libopenssl-devel
   - cronie
   - cronie-anacron
   - which
 
+swift_devel_distro_packages:
+  - gcc
+  - liberasurecode1
+  - liberasurecode-devel
+  - libffi-devel
+  - python-devel
+  - libopenssl-devel
+
 swift_service_distro_packages:
   - openstack-swift
   - openstack-swift-account