diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 66bae4b..ea10dc8 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -13,7 +13,7 @@
   register: elasticsearch_install
 
 - name: Debian - Download elasticsearch from url
-  get_url: url={{ __es_package_url.default }}-{{ es_version }}.deb dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no
+  get_url: url={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.deb{% endif %} dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no
   when: not es_use_repository
 
 - name: Debian - Ensure elasticsearch is installed from downloaded package
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index 8869d9c..98f37a9 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -2,10 +2,19 @@
 - name: Ensure libselinux-python on CentOS 6.x
   yum: name=libselinux-python state=present update_cache=yes
   when: ( ansible_distribution == "CentOS" ) and ( ansible_distribution_major_version == "6" )
+
 - name: RedHat - add Elasticsearch repo
   template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo
+  when: es_use_repository
+
 - name: RedHat - Install Elasticsearch
   yum: name=elasticsearch{% if es_version is defined and es_version != ""  %}-{{ es_version }}{% endif %} state=present update_cache=yes
+  when: es_use_repository
+  register: elasticsearch_install
+
+- name: RedHat - Install Elasticsearch from url
+  yum: name={{ es_package_url }}-{{ es_version }}.noarch.rpm state=present
+  when: not es_use_repository
   register: elasticsearch_install
 
 - name: RedHat - configure memory
diff --git a/tasks/java-Debian.yml b/tasks/java-Debian.yml
index 477690b..199e98f 100644
--- a/tasks/java-Debian.yml
+++ b/tasks/java-Debian.yml
@@ -1,5 +1,5 @@
 ---
 # Debian specific Java
 - name: Debian - Ensure Java is installed
-  apt: name={{ item }} state=present cache_valid_time=86400
+  apt: name={{ item }} state=present update_cache=yes
   with_items: java_packages
diff --git a/vars/main.yml b/vars/main.yml
index d3cad84..f4531d4 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,2 @@
 ---
-__es_package_url:
-        default: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"
-        url_master: "http://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/origin/master/nightly/JDK7/elasticsearch-latest-"
-        url_17: "http://s3-eu-west-1.amazonaws.com/build.eu-west-1.elastic.co/origin/1.7/nightly/JDK7/elasticsearch-latest-"
-        url_16: "http://s3-eu-west-1.amazonaws.com/build.eu-west-1.elastic.co/origin/1.6/nightly/JDK7/elasticsearch-latest-"
+es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"