diff --git a/defaults/main.yml b/defaults/main.yml
index 5870bc4..7aad86e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,8 @@
 ---
 es_major_version: "1.5"
-es_version: "1.5.2"
+es_version: "1.5.1"
 es_version_lock: false
+es_use_repository: false
 es_start_service: true
 es_plugins_reinstall: false
 es_user: elasticsearch
diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 64cb450..52dcf10 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -1,10 +1,24 @@
 ---
 - name: Debian - Add Elasticsearch repository key
   apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present
+  when: es_use_repository == "true"
+
 - name: Debian - add elasticsearch repository
   apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present
+  when: es_use_repository == "true"
+
 - name: Debian - Ensure elasticsearch is installed.
   apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present cache_valid_time=86400
+  when: es_use_repository == "true"
+  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
+  when: es_use_repository != "true"
+
+- name: Debian - Ensure elasticsearch is installed from downloaded package.
+  apt: deb=/tmp/elasticsearch-{{ es_version }}.deb
+  when: es_use_repository != "true"
   register: elasticsearch_install
 
 - name: Debian - configure memory
diff --git a/vars/main.yml b/vars/main.yml
index ed97d53..d3cad84 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1 +1,6 @@
 ---
+__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-"