diff --git a/rpc_deployment/inventory/group_vars/kibana.yml b/rpc_deployment/inventory/group_vars/kibana.yml
index 9228742ef5..16d8439ded 100644
--- a/rpc_deployment/inventory/group_vars/kibana.yml
+++ b/rpc_deployment/inventory/group_vars/kibana.yml
@@ -22,14 +22,6 @@ verbose: True
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
 
-kibana_url: http://rpc-slushee.rackspace.com/downloads/kibana-3.1.0.tar.gz
-
-kibana_root: /opt/kibana
-
-container_packages:
-  - apache2
-  - python-passlib
-
 system_user: www-user
 system_group: www-data
 
@@ -37,7 +29,3 @@ kibana_fqdn: "{{ external_vip_address }}"
 kibana_server_name: "{{ container_name }}"
 kibana_self_signed: true
 kibana_ssl_port: 8443
-
-service_pip_dependencies:
-  - python-memcached
-  - pycrypto
diff --git a/rpc_deployment/playbooks/infrastructure/kibana-install.yml b/rpc_deployment/playbooks/infrastructure/kibana-install.yml
index cebe441f0f..8cad2f8241 100644
--- a/rpc_deployment/playbooks/infrastructure/kibana-install.yml
+++ b/rpc_deployment/playbooks/infrastructure/kibana-install.yml
@@ -20,3 +20,5 @@
     - common
     - container_common
     - kibana
+  vars_files:
+    - vars/repo_packages/kibana.yml
diff --git a/rpc_deployment/vars/repo_packages/kibana.yml b/rpc_deployment/vars/repo_packages/kibana.yml
index c9973382db..7e9e19f4e8 100644
--- a/rpc_deployment/vars/repo_packages/kibana.yml
+++ b/rpc_deployment/vars/repo_packages/kibana.yml
@@ -15,6 +15,7 @@
 
 repo_package_name: kibana
 
+kibana_root: /opt/kibana
 kibana_url: "{{ rpc_repo_url }}/downloads/kibana-3.1.0.tar.gz"
 kibana_sha256sum: "059a4b6b507b9ff771901d12035e499b0e8d1cae7d9e5284633e19da6c294e07"
 
@@ -22,3 +23,7 @@ container_packages:
   - apache2
   - python-passlib
   - openjdk-7-jre
+
+service_pip_dependencies:
+  - python-memcached
+  - pycrypto