diff --git a/java/map.jinja b/java/map.jinja
index 55cab04..11e0f71 100644
--- a/java/map.jinja
+++ b/java/map.jinja
@@ -21,24 +21,24 @@
         'release': java_release,
         'home_dir': '/usr/lib/java',
         'build': java_build,
-        'pkgs': ['openjdk-' + java_version|string + '-jre' + headless_str|default("")],
-        'dev_pkgs': ['openjdk-' + java_version|string + '-jdk' + headless_str|default("")],
+        'pkgs': ['openjdk-' + java_version + '-jre' + headless_str|default("")],
+        'dev_pkgs': ['openjdk-' + java_version + '-jdk' + headless_str|default("")],
     },
     'RedHat': {
         'version': java_version,
         'release': java_release,
         'home_dir': '/usr/lib/java',
         'build': java_build,
-        'pkgs': ['java-1.' + java_version|string + '.0-openjdk'],
-        'dev_pkgs': ['java-1.' + java_version|string + '.0-openjdk'],
+        'pkgs': ['java-1.' + java_version + '.0-openjdk'],
+        'dev_pkgs': ['java-1.' + java_version + '.0-openjdk'],
     },
 }, merge=salt['pillar.get']('java:environment')) %}
 
 {%- set java_home = environment.home_dir %}
-{%- set version_name = 'jdk1.'+environment.version|string+'.0_'+environment.release %}
-{%- set file_name = 'jdk-'+environment.version|string+'u'+environment.release %}
+{%- set version_name = 'jdk1.'+environment.version+'.0_'+environment.release %}
+{%- set file_name = 'jdk-'+environment.version+'u'+environment.release %}
 {%- set prefix = '/usr/share/java' %}
-{%- set source_url = 'http://download.oracle.com/otn-pub/java/jdk/'+environment.version|string+'u'+environment.release+'-b'+environment.build+'/'+file_name+'-linux-x64.tar.gz' %}
+{%- set source_url = 'http://download.oracle.com/otn-pub/java/jdk/'+environment.version+'u'+environment.release+'-b'+environment.build+'/'+file_name+'-linux-x64.tar.gz' %}
 {%- set dl_opts = '-b oraclelicense=accept-securebackup-cookie -L' %}
 {%- set java_real_home = prefix + '/' + version_name %}
 
diff --git a/metadata/service/environment/init.yml b/metadata/service/environment/init.yml
index d745098..2ec3191 100644
--- a/metadata/service/environment/init.yml
+++ b/metadata/service/environment/init.yml
@@ -4,6 +4,6 @@
   java:
     environment:
       enabled: true
-      version: ${_param:java_environment_version}
+      version: "${_param:java_environment_version}"
       platform: ${_param:java_environment_platform}
       development: true