diff --git a/installer/inventory b/installer/inventory
index ed7fa16afd..210162b746 100644
--- a/installer/inventory
+++ b/installer/inventory
@@ -84,11 +84,14 @@ pg_username=awx
 # pg_password should be random 10 character alphanumeric string, when postgresql is running on kubernetes
 # NB: it's a limitation of the "official" postgres helm chart
 pg_password=awxpass
-pg_admin_password=postgrespass
 pg_database=awx
 pg_port=5432
 #pg_sslmode=require
 
+# The following variable is only required when using the provided
+# containerized postgres deployment on OpenShift
+# pg_admin_password=postgrespass
+
 # RabbitMQ Configuration
 rabbitmq_password=awxpass
 rabbitmq_erlang_cookie=cookiemonster
diff --git a/installer/roles/check_vars/tasks/check_openshift.yml b/installer/roles/check_vars/tasks/check_openshift.yml
index 38d66b352c..03f96d5be5 100644
--- a/installer/roles/check_vars/tasks/check_openshift.yml
+++ b/installer/roles/check_vars/tasks/check_openshift.yml
@@ -46,3 +46,10 @@
     - docker_registry_password is defined and docker_registry_password != ''
     msg: "Set the value of 'docker_registry_password' in the inventory file."
   when: dockerhub_base is not defined
+
+- name: pg_admin_password should be defined
+  assert:
+    that:
+      - pg_admin_password is defined and pg_admin_password != ''
+  when:
+    - pg_hostname is not defined or pg_hostname == ''
diff --git a/installer/roles/kubernetes/templates/environment.sh.j2 b/installer/roles/kubernetes/templates/environment.sh.j2
index db5cd548da..917d20f6d3 100644
--- a/installer/roles/kubernetes/templates/environment.sh.j2
+++ b/installer/roles/kubernetes/templates/environment.sh.j2
@@ -3,7 +3,9 @@ DATABASE_NAME={{ pg_database }}
 DATABASE_HOST={{ pg_hostname|default('postgresql') }}
 DATABASE_PORT={{ pg_port|default('5432') }}
 DATABASE_PASSWORD={{ pg_password | quote }}
-DATABASE_ADMIN_PASSWORD={{ pg_admin_password | quote }}
+{% if pg_admin_password is defined %}
+DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
+{% endif %}
 MEMCACHED_HOST={{ memcached_hostname|default('localhost') }}
 MEMCACHED_PORT={{ memcached_port|default('11211') }}
 RABBITMQ_HOST={{ rabbitmq_hostname|default('localhost') }}
diff --git a/installer/roles/local_docker/templates/environment.sh.j2 b/installer/roles/local_docker/templates/environment.sh.j2
index 832f112d6d..817c270e11 100644
--- a/installer/roles/local_docker/templates/environment.sh.j2
+++ b/installer/roles/local_docker/templates/environment.sh.j2
@@ -3,7 +3,9 @@ DATABASE_NAME={{ pg_database|quote }}
 DATABASE_HOST={{ pg_hostname|default('postgres')|quote }}
 DATABASE_PORT={{ pg_port|default('5432')|quote }}
 DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }}
-DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass')|quote }}
+{% if pg_admin_password is defined %}
+DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
+{% endif %}
 MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
 MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
 RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq')|quote }}