Further tweaks for docker setup (still in progress)
Docker updates