diff --git a/requirements.txt b/requirements.txt
index 37d8e6b0e9..0432adb808 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,5 @@ requests==2.4.1
 cloudlib==0.0.8
 pip==1.5.6
 wheel==0.24.0
+setuptools==7.0
 http://mirror.rackspace.com/rackspaceprivatecloud/downloads/ansible-1.6.10.tar.gz
diff --git a/rpc_deployment/vars/repo_packages/all_common.yml b/rpc_deployment/vars/repo_packages/all_common.yml
index 5298278e9f..23ac105879 100644
--- a/rpc_deployment/vars/repo_packages/all_common.yml
+++ b/rpc_deployment/vars/repo_packages/all_common.yml
@@ -39,12 +39,6 @@ apt_common_repos:
 get_pip_url: "{{ rpc_repo_url }}/downloads/get-pip.py"
 get_pip_sha256sum: "d43dc33a5670d69dd14a9be1f2b2fa27ebf124ec1b212a47425331040f742a9b"
 
-pip_common_packages:
-  - wheel
-  - setuptools
-  - pip
-
-
 ## Base Packages
 apt_common_packages:
   - aptitude
diff --git a/rpc_deployment/vars/repo_packages/readme.rst b/rpc_deployment/vars/repo_packages/readme.rst
index 69a3c7ffd0..1450398dbc 100644
--- a/rpc_deployment/vars/repo_packages/readme.rst
+++ b/rpc_deployment/vars/repo_packages/readme.rst
@@ -34,6 +34,5 @@ Defaults processed by the **package_source_archive**,
   * pip_wheel_name: ``string`` pip package name to FIRST attempt installation of.
   * service_pip_dependencies: ``list`` of ``strings``.
   * container_packages: ``list`` of ``strings``.
-  * pip_common_packages: ``list`` of ``strings``.
   * apt_common_packages: ``list`` of ``strings``.
   * common_util_packages: ``list`` of ``strings``.
diff --git a/rpc_deployment/vars/repo_packages/swift.yml b/rpc_deployment/vars/repo_packages/swift.yml
index 6671754fb1..3193e8713e 100644
--- a/rpc_deployment/vars/repo_packages/swift.yml
+++ b/rpc_deployment/vars/repo_packages/swift.yml
@@ -37,11 +37,9 @@ service_pip_dependencies:
 
 container_packages:
   - curl
-  - python-pip
   - rsync
   - openssh-server
   - git-core
-  - python-setuptools
   - python-dev
   - gcc
   - libffi-dev