diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 4d575cc..aff9607 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -7,10 +7,10 @@ postgres:
   pkgs_extra: []
   pkg_client: postgresql-client
   pkg_dev: postgresql-devel
-  pkg_libpq_dev: postgresql-libs
-  python: python-psycopg2
+  pkg_libpq_dev: libpq-dev
+  pkg_libs: postgresql-libs
+  pkg_python: python-psycopg2
   userhomes: /home
-  systemuser:
   user: postgres
   group: postgres
 
diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
index ccf4aa2..a13162f 100644
--- a/postgres/osmap.yaml
+++ b/postgres/osmap.yaml
@@ -17,7 +17,6 @@ Debian:
     file: /etc/apt/sources.list.d/pgdg.list
   pkg_repo_keyid: ACCC4CF8
   pkg_dev: postgresql-server-dev-all
-  pkg_libpq_dev: libpq-dev
 
 FreeBSD:
   user: pgsql
@@ -34,11 +33,12 @@ RedHat:
     gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
 
 {% if repo.use_upstream_repo == true %}
-
   {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
 
   pkg: postgresql{{ release }}-server
   pkg_client: postgresql{{ release }}
+  pkg_libs: postgresql{{ release }}-libs
+  pkg_dev: postgresql{{ release }}-devel
   conf_dir: /var/lib/pgsql/{{ repo.version }}/data
   service: postgresql-{{ repo.version }}
 
@@ -93,6 +93,7 @@ RedHat:
   pkg_client: postgresql
 
 {% endif %}
+  pkg_libpq_dev: libpqxx-devel
 
 Suse:
   pkg_repo:
@@ -105,22 +106,16 @@ Suse:
     gpgautoimport: True
 
 {% if repo.use_upstream_repo == true %}
-  {# Pillars needed are 'use_upstream_repo: True' and 'version: n.n'. #}
-  {# Avoid setting package names as pillars, as may corrupt postgres. #}
   {% set lib_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
 
   pkg: postgresql{{ release }}-server
   pkg_client: postgresql{{ release }}
+  pkg_dev: postgresql{{ release }}-devel
+  pkg_libs: postgresql{{ release }}-libs
   conf_dir: {{ lib_dir }}
   service: postgresql-{{ repo.version }}
 
-  #This is postgresql-libs in defaults.yml but upstream is libpqxx
-  pkg_libpq_dev: libpqxx
-  pkg_dev: postgresql{{ release }}-devel
-  pkg_libs: postgresql{{ release }}-libs
-
   prepare_cluster:
-    #Full path needed as initdb is NOT 'cross version compatible' binary
     command: /usr/pgsql-{{ repo.version }}/bin/initdb --pgdata='{{ lib_dir }}'
     test: test -f '{{ lib_dir }}/PG_VERSION'
 
@@ -155,10 +150,9 @@ Suse:
 
   pkg: postgresql-server
   pkg_client: postgresql
-  pkg_libpq_dev: libqpxx
-  pkg_libs: postgresql-libs
 
 {% endif %}
+  pkg_libpq_dev: libqpxx
 
 {%- if grains.os == 'MacOS' %}
 ## jinja check avoids rendering noise/failure on Linux
diff --git a/postgres/python.sls b/postgres/python.sls
index a35d721..a206bfc 100644
--- a/postgres/python.sls
+++ b/postgres/python.sls
@@ -2,4 +2,4 @@
 
 postgresql-python:
   pkg.installed:
-    - name: {{ postgres.python}}
+    - name: {{ postgres.pkg_python}}