diff --git a/postgres/client.sls b/postgres/client/init.sls
similarity index 100%
rename from postgres/client.sls
rename to postgres/client/init.sls
diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index aff9607..2e17dd8 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -21,6 +21,7 @@ postgres:
     env: []
 
   conf_dir: /var/lib/pgsql/data
+  conf_dir_mode: '0775'
   postgresconf: ""
 
   macos:
diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index c643e25..587aa47 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -73,7 +73,7 @@ postgresql-config-dir:
     - name: {{ postgres.conf_dir }}
     - user: {{ postgres.user }}
     - group: {{ postgres.group }}
-    - dir_mode: 775
+    - dir_mode: {{ postgres.conf_dir_mode }}
     - force: True
     - file_mode: 644
     - recurse:
@@ -115,7 +115,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 }}
@@ -142,7 +142,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 }}