diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 805fed5..9172a9b 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -39,30 +39,3 @@ postgres:
     command: service postgresql initdb
     test: test -f /var/lib/pgsql/data/PG_VERSION
     env: {}
-
-  # Client executables list
-  client_bins:
-    - clusterdb
-    - createdb
-    - createlang
-    - createuser
-    - dropdb
-    - droplang
-    - dropuser
-    - pg_archivecleanup
-    - pg_basebackup
-    - pg_config
-    - pg_dump
-    - pg_dumpall
-    - pg_isready
-    - pg_receivexlog
-    - pg_restore
-    - pg_rewind
-    - pg_test_fsync
-    - pg_test_timing
-    - pg_upgrade
-    - pg_xlogdump
-    - pgbench
-    - psql
-    - reindexdb
-    - vacuumdb
diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
index 7864a00..ebef733 100644
--- a/postgres/osmap.yaml
+++ b/postgres/osmap.yaml
@@ -39,10 +39,37 @@ RedHat:
 
   pkg: postgresql{{ release }}-server
   pkg_client: postgresql{{ release }}
-  bin_dir: /usr/pgsql-{{ repo.version }}/bin
   conf_dir: /var/lib/pgsql/{{ repo.version }}/data
   service: postgresql-{{ repo.version }}
 
+  # Directory containing PostgreSQL client executables
+  bin_dir: /usr/pgsql-{{ repo.version }}/bin
+  client_bins:
+    - clusterdb
+    - createdb
+    - createlang
+    - createuser
+    - dropdb
+    - droplang
+    - dropuser
+    - pg_archivecleanup
+    - pg_basebackup
+    - pg_config
+    - pg_dump
+    - pg_dumpall
+    - pg_isready
+    - pg_receivexlog
+    - pg_restore
+    - pg_rewind
+    - pg_test_fsync
+    - pg_test_timing
+    - pg_upgrade
+    - pg_xlogdump
+    - pgbench
+    - psql
+    - reindexdb
+    - vacuumdb
+
 {% else %}
 
   pkg: postgresql-server