diff --git a/tasks/main.yml b/tasks/main.yml
index ce16757..2ad90e4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,14 +7,6 @@
   fail: msg="ERROR - required variable 'java_version' missing."
   when: java_version is not defined
 
-- name: precondition - java_subversion
-  fail: msg="ERROR - required variable 'java_subversion' missing."
-  when: java_subversion is not defined
-
-- name: precondition - java_install_jce
-  fail: msg="ERROR - required variable 'java_install_jce' missing."
-  when: java_install_jce is not defined
-
 - include: set-role-variables.yml
 
 
diff --git a/tasks/set-role-variables.yml b/tasks/set-role-variables.yml
index b330454..725bca6 100644
--- a/tasks/set-role-variables.yml
+++ b/tasks/set-role-variables.yml
@@ -4,22 +4,30 @@
 #
 
 
-- name: set general internal vars for {{ java_version }}
+- name: set general internal vars for java 8
   set_fact:
     jdk_version: "1.{{ java_version }}.0_{{ java_subversion }}"
   when: java_version == 8
 
-- name: set general internal vars for {{ java_version }}
+- name: set java subversion java 9
   set_fact:
     # JDK 9 is only available in 9.0.4
-    jdk_subversion: 0.4
+    java_subversion: 0.4
+  when: java_version == 9
+
+- name: set general internal vars for java 9
+  set_fact:
     jdk_version: "{{ java_version }}.{{ java_subversion }}"
   when: java_version == 9
 
-- name: set general internal vars for {{ java_version }}
+- name: set java subversion for java 10
+  set_fact:
+    # JDK 10 is only available in 10.0.2
+    java_subversion: 0.2
+  when: java_version == 10
+
+- name: set general internal vars for java 10
   set_fact:
-    # JDK 10 is only available in 10.0.1
-    jdk_subversion: 0.1
     jdk_version: "{{ java_version }}.{{ java_subversion }}"
   when: java_version == 10
 
diff --git a/test_10.yml b/test_10.yml
index b673dfe..fcc5a95 100644
--- a/test_10.yml
+++ b/test_10.yml
@@ -8,12 +8,10 @@
   # vars from defaults/main.yml
   vars:
     - java_version: 10
-    - java_subversion: 0.1
 
     - java_download_path: /tmp
     - java_download_from_oracle: true
     - java_remove_download: false
-    - java_install_jce: false
     - java_mirror: http://download.oracle.com/otn-pub/java
 
     - java_set_javahome: false
diff --git a/test_9.yml b/test_9.yml
index 08b065a..7a04fc8 100644
--- a/test_9.yml
+++ b/test_9.yml
@@ -8,7 +8,6 @@
   # vars from defaults/main.yml
   vars:
     java_version: 9
-    java_subversion: 0.4
 
     java_download_path: /tmp
     java_download_from_oracle: true