diff --git a/vars/main.yml b/vars/main.yml
index 4af269d..c9f1411 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -80,7 +80,7 @@ _java_openjdk_package:
       default: openjdk-17-jdk
       Amazon: java-17-amazon-corretto-devel
 
-java_openjdk_package: "{{ _java_openjdk_package[java_type][java_version | int][ansible_distribution] | default(_java_openjdk_package[java_type][java_version | int]['default'] | default([])) }}"
+java_openjdk_package: "{{ _java_openjdk_package[java_type][java_version | int][ansible_distribution] | default(_java_openjdk_package[java_type][java_default_version | int]['default'] | default([] )) }}"
 
 _java_package:
   oracle:
@@ -103,6 +103,6 @@ _java_package:
         rpm: jdk-10.0.2_linux-x64_bin.rpm
         directory: jdk-10.0.2
 
-java_oracle_package: "{{ _java_oracle_package[java_type][java_version][java_format] | default([]) }}"
+java_oracle_package: "{{ _java_oracle_package[java_type][java_version | int][java_format] | default([] ) }}"
 
-java_oracle_directory: "{{ _java_oracle_package[java_type][java_version]['directory'] }}"
+java_oracle_directory: "{{ _java_oracle_package[java_type][java_version | int]['directory'] }}"