diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index 98f37a9..3363634 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -13,7 +13,7 @@
   register: elasticsearch_install
 
 - name: RedHat - Install Elasticsearch from url
-  yum: name={{ es_package_url }}-{{ es_version }}.noarch.rpm state=present
+  yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
   when: not es_use_repository
   register: elasticsearch_install
 
diff --git a/tasks/java-Debian.yml b/tasks/java-Debian.yml
deleted file mode 100644
index 199e98f..0000000
--- a/tasks/java-Debian.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# Debian specific Java
-- name: Debian - Ensure Java is installed
-  apt: name={{ item }} state=present update_cache=yes
-  with_items: java_packages
diff --git a/tasks/java-RedHat.yml b/tasks/java-RedHat.yml
deleted file mode 100644
index 7bf07ef..0000000
--- a/tasks/java-RedHat.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# RedHat specific Java
-- name: RedHat - Ensure Java is installed
-  yum: name={{ item }} state=latest
-  with_items: java_packages
-
diff --git a/tasks/java.yml b/tasks/java.yml
index 9c4dafb..7b042b0 100644
--- a/tasks/java.yml
+++ b/tasks/java.yml
@@ -1,15 +1,8 @@
 ---
-- name: Java - Define java_packages
-  set_fact:
-    java_packages: "{{ __java_packages | list }}"
-  when: java_packages is not defined  
-
-- name: Include Debian specific Java stuff
-  include: java-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Include RedHat specific Java stuff
-  include: java-RedHat.yml
+- name: RedHat - Ensure Java is installed
+  yum: name={{ java_rhel }} state=latest
   when: ansible_os_family == 'RedHat'
-
-
+  
+- name: Debian - Ensure Java is installed
+  apt: name={{ java_debian }} state=present update_cache=yes
+  when: ansible_os_family == 'Debian'
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index d889001..f376d38 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-- name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
 - include: java.yml
 - include: elasticsearch.yml
 - include: elasticsearch-plugins.yml
diff --git a/vars/Debian.yml b/vars/Debian.yml
deleted file mode 100644
index 4c1c67e..0000000
--- a/vars/Debian.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-__java_packages:
-        - "openjdk-7-jre-headless"
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
deleted file mode 100644
index b4f6c25..0000000
--- a/vars/RedHat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-__java_packages:
-  - "java-1.8.0-openjdk.x86_64"
diff --git a/vars/main.yml b/vars/main.yml
index f4531d4..7a6e693 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,4 @@
 ---
-es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"
+java_debian: "openjdk-7-jre-headless"
+java_rhel: "java-1.8.0-openjdk.x86_64"
+es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"
\ No newline at end of file