diff --git a/vars/Debian.yml b/vars/Debian.yml
index 7725f49..cfa73ae 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,4 +1,4 @@
 ---
-java: "{{ es_java | default('openjdk-7-jre-headless') }}"
+java: "{% if es_java is defined %}{{es_java}}{%elif (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('15.10', '>=')) %}openjdk-8-jre-headless{% else %}openjdk-7-jre-headless{% endif %}" 
 default_file: "/etc/default/elasticsearch"
-es_home: "/usr/share/elasticsearch"
\ No newline at end of file
+es_home: "/usr/share/elasticsearch"