diff --git a/openjdk/map.jinja b/openjdk/map.jinja
index c3addb9..85e5625 100644
--- a/openjdk/map.jinja
+++ b/openjdk/map.jinja
@@ -1,12 +1,13 @@
-{% if salt['pillar.get']('openjdk:version', 11) == 21 %}
+{% set _openjdk_version = salt['pillar.get']('openjdk:version', 11)|int %}
+{% if _openjdk_version == 21 %}
 {% import_yaml 'openjdk/osfamily_map_jdk21.yaml' as osfamily_map %}
 {% import_yaml 'openjdk/codename_map_jdk21.yaml' as codename_map %}
 {% set pillar_section_name = "openjdk:openjdk21" %}
-{% elif salt['pillar.get']('openjdk:version', 11) == 17 %}
+{% elif _openjdk_version == 17 %}
 {% import_yaml 'openjdk/osfamily_map_jdk17.yaml' as osfamily_map %}
 {% import_yaml 'openjdk/codename_map_jdk17.yaml' as codename_map %}
 {% set pillar_section_name = "openjdk:openjdk17" %}
-{% elif salt['pillar.get']('openjdk:version', 11) == 11 %}
+{% elif _openjdk_version == 11 %}
 {% import_yaml 'openjdk/osfamily_map_jdk11.yaml' as osfamily_map %}
 {% import_yaml 'openjdk/codename_map_jdk11.yaml' as codename_map %}
 {% set pillar_section_name = "openjdk:openjdk11" %}