WIP - Reorganize OpenShift Docker image builds

Will manage release versions of image builds