diff --git a/rpc_deployment/inventory/group_vars/elasticsearch.yml b/rpc_deployment/inventory/group_vars/elasticsearch.yml
index 089e66ae05..2b1dece8fb 100644
--- a/rpc_deployment/inventory/group_vars/elasticsearch.yml
+++ b/rpc_deployment/inventory/group_vars/elasticsearch.yml
@@ -21,17 +21,3 @@ verbose: True
 
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
-
-apt_container_keys:
-  - { url: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch", state: "present" }
-
-apt_container_repos:
-  - { repo: "deb http://packages.elasticsearch.org/elasticsearch/1.2/debian stable  main", state: "present"}
-
-container_packages:
-  - elasticsearch
-
-service_pip_dependencies:
-  - requests
-  - python-memcached
-  - pycrypto
diff --git a/rpc_deployment/playbooks/infrastructure/elasticsearch-install.yml b/rpc_deployment/playbooks/infrastructure/elasticsearch-install.yml
index 13e694391f..b846d94f01 100644
--- a/rpc_deployment/playbooks/infrastructure/elasticsearch-install.yml
+++ b/rpc_deployment/playbooks/infrastructure/elasticsearch-install.yml
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Setup supporting services
 - hosts: elasticsearch
   user: root
   roles:
     - container_extra_setup
-  vars_files:
-    - vars/config_vars/container_config_elasticsearch.yml
-
-- hosts: elasticsearch
-  user: root
-  roles:
     - common
     - container_common
     - logging_common
     - elasticsearch
+  vars_files:
+    - vars/config_vars/container_config_elasticsearch.yml
+    - vars/repo_packages/elasticsearch.yml
diff --git a/rpc_deployment/vars/repo_packages/elasticsearch.yml b/rpc_deployment/vars/repo_packages/elasticsearch.yml
index 15f1f03ab7..c7998a2f29 100644
--- a/rpc_deployment/vars/repo_packages/elasticsearch.yml
+++ b/rpc_deployment/vars/repo_packages/elasticsearch.yml
@@ -27,3 +27,5 @@ container_packages:
 
 service_pip_dependencies:
   - requests
+  - python-memcached
+  - pycrypto