Fix up usage of environment variables for openshift