Fixes of the id management and dockerfile