diff --git a/installer/inventory b/installer/inventory
index fb966933eb..c181516ae4 100644
--- a/installer/inventory
+++ b/installer/inventory
@@ -8,6 +8,7 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth
 # by default the base will be used to search for ansible/awx_web and ansible/awx_task
 dockerhub_base=ansible
 dockerhub_version=latest
+rabbitmq_version=3.6.14
 
 # This will create or update a default admin (superuser) account in AWX, if not provided
 # then these default values are used
@@ -93,4 +94,4 @@ pg_port=5432
 
 # AWX project data folder. If you need access to the location where AWX stores the projects
 # it manages from the docker host, you can set this to turn it into a volume for the container.
-#project_data_dir=/var/lib/awx/projects
\ No newline at end of file
+#project_data_dir=/var/lib/awx/projects
diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/openshift/templates/deployment.yml.j2
index 6414cc5e3d..ec2aa59594 100644
--- a/installer/openshift/templates/deployment.yml.j2
+++ b/installer/openshift/templates/deployment.yml.j2
@@ -33,7 +33,7 @@ spec:
             - name: DATABASE_HOST
               value: {{ pg_hostname|default('postgresql') }}
             - name: DATABASE_PORT
-              value: {{ pg_port|default(5432) }}
+              value: "{{ pg_port|default('5432') }}"
             - name: DATABASE_PASSWORD
               value: {{ pg_password }}
             - name: MEMCACHED_HOST
@@ -45,7 +45,7 @@ spec:
             - name: AWX_ADMIN_PASSWORD
               value: {{ default_admin_password|default('password') }}
         - name: awx-rabbit
-          image: ansible/awx_rabbitmq:latest
+          image: ansible/awx_rabbitmq:{{ rabbitmq_version }}
           imagePullPolicy: Always
           env:
             # For consupmption by rabbitmq-env.conf