Updated Keystone setup and docker file