Removing geard and adding openshift 3 options