updated for oracle docker image and some cleanup