Make agent uri unique
Cleanup Docker build
WIP