diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index f35cbc0..fc96953 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -21,7 +21,7 @@ postgres:
     env: []
 
   conf_dir: /var/lib/pgsql/data
-  conf_dir_mode: 0775
+  conf_dir_mode: '0775'
   postgresconf: ""
 
   macos:
diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 1789425..29ca4f5 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -117,7 +117,7 @@ postgresql-pg_hba:
     - source: {{ postgres['pg_hba.conf'] }}
     - template: jinja
     - defaults:
-        acls: {{ postgres.acls }}
+        acls: {{ postgres.acls|yaml() }}
   {%- if postgres.config_backup %}
     # Create the empty file before managing to overcome the limitation of check_cmd
     - onlyif: test -f {{ pg_hba_path }} || touch {{ pg_hba_path }}
@@ -144,7 +144,7 @@ postgresql-pg_ident:
     - source: {{ postgres['pg_ident.conf'] }}
     - template: jinja
     - defaults:
-        mappings: {{ postgres.identity_map }}
+        mappings: {{ postgres.identity_map|yaml() }}
   {%- if postgres.config_backup %}
     # Create the empty file before managing to overcome the limitation of check_cmd
     - onlyif: test -f {{ pg_ident_path }} || touch {{ pg_ident_path }}
diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index cf92872..2fae147 100644
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -22,14 +22,11 @@ postgresql-repo:
 
   {%- endif -%}
 
-{%- else -%}
+{%- elif grains.os not in ('Windows', 'MacOS',) %}
 
-# Notify that we don't manage this distro
-  {% if grains.os not in ('Windows', 'MacOS',) %}
 postgresql-repo:
   test.show_notification:
     - text: |
         PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
-  {% endif %}
 
 {%- endif %}