diff --git a/postgresql/map.jinja b/postgresql/map.jinja
index 901d890..396d66a 100644
--- a/postgresql/map.jinja
+++ b/postgresql/map.jinja
@@ -7,24 +7,24 @@
 {%- set default_version = '9.5' %}
 {%- endif %}
 
-{%- set version = pillar.postgresql.server.get('version', default_version)|string %}
+{%- set version = pillar.postgresql.server.get('version', default_version) %}
 {%- set version_numbers = version|replace('.', '') %}
 {%- set server = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['postgresql-'+version, 'postgresql-contrib-'+version, 'postgresql-doc-'+version],
-        'bdr_pkgs': ['sudo', 'postgresql-bdr-'+version+'-bdr-plugin', 'postgresql-bdr-'+version, 'postgresql-bdr-client-'+version, 'postgresql-bdr-contrib-'+version],
+        'pkgs': ['postgresql-'+version, 'postgresql-contrib-' ~ version, 'postgresql-doc-' ~ version],
+        'bdr_pkgs': ['sudo', 'postgresql-bdr-'+version+'-bdr-plugin', 'postgresql-bdr-' ~ version, 'postgresql-bdr-client-' ~ version, 'postgresql-bdr-contrib-' ~ version],
         'service': 'postgresql',
         'version': version,
         'init_command': 'pg_createcluster '+version+' main --start',
         'dir': {
-          'config': '/etc/postgresql/'+version+'/main',
-          'data': '/var/lib/postgresql/'+version+'/main'
+          'config': '/etc/postgresql/' ~ version ~ '/main',
+          'data': '/var/lib/postgresql/' ~ version ~ '/main'
         },
         'gis': False,
     },
     'RedHat': {
         'pkgs': ['postgresql93-server', 'postgresql93-contrib'],
-        'service': 'postgresql-'+version,
+        'service': 'postgresql-' ~ version,
         'version': version,
         'init_command': 'service postgresql-9.3 initdb',
         'dir': {
@@ -39,10 +39,10 @@
         'pkgs': [],
         'service': 'postgresql',
         'version': version,
-        'init_command': 'pg_createcluster '+version+' main --start',
+        'init_command': 'pg_createcluster ' ~ version ~ ' main --start',
         'dir': {
-          'config': '/etc/postgresql/'+version+'/main',
-          'data': '/var/lib/postgresql/'+version+'/main'
+          'config': '/etc/postgresql/' ~ version ~ '/main',
+          'data': '/var/lib/postgresql/' ~ version ~ '/main'
         },
         'archive': "off",
         'synchronous': False,